Merge pull request livecode#2960 from peter-b/cleanup/unused-variable

peter-b · peter-b · commit 8db7eda7f746 · 2015-09-30T18:42:39.000+01:00
libscript: Remove unused t_arg_types from MCScriptPerformForeignInvoke()
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -1229,7 +1229,6 @@ static bool MCScriptPerformForeignInvoke(MCScriptFrame*& x_frame, MCScriptInstan
     MCHandlerTypeFieldMode t_modes[16];
     MCResolvedTypeInfo t_types[16];
     void *t_args[16];
-    ffi_type *t_arg_types[16];
     bool t_arg_new[16];
     MCScriptStackStorage t_invoke_storage;
     
@@ -1427,23 +1426,19 @@ static bool MCScriptPerformForeignInvoke(MCScriptFrame*& x_frame, MCScriptInstan
             {
                 // In mode arguments are the value themselves.
                 t_args[t_arg_index] = t_argument;
-                t_arg_types[t_arg_index] = (ffi_type *)MCForeignTypeInfoGetLayoutType(t_types[t_arg_index] . type);
             }
             else
             {
                 // Allocate space for the storage pointer
                 t_args[t_arg_index] = t_invoke_storage.Allocate(sizeof(void *));
                 *(void **)t_args[t_arg_index] = t_argument;
-                t_arg_types[t_arg_index] = &ffi_type_pointer;
             }
         }
         else
         {
             // Out mode arguments are the contents for foreign values but
             // marked 'pointer' type. However, for valuerefs we must make storage
             // to put the valueref in.
-            t_arg_types[t_arg_index] = &ffi_type_pointer;
-            
             if (t_descriptor != nil)
             {
                 // Allocate space for the storage pointer

Original file line number	Diff line number	Diff line change
`@@ -1229,7 +1229,6 @@ static bool MCScriptPerformForeignInvoke(MCScriptFrame*& x_frame, MCScriptInstan`
`1229`	`1229`	`MCHandlerTypeFieldMode t_modes[16];`
`1230`	`1230`	`MCResolvedTypeInfo t_types[16];`
`1231`	`1231`	`void *t_args[16];`
`1232`		`- ffi_type *t_arg_types[16];`
`1233`	`1232`	`bool t_arg_new[16];`
`1234`	`1233`	`MCScriptStackStorage t_invoke_storage;`
`1235`	`1234`
`@@ -1427,23 +1426,19 @@ static bool MCScriptPerformForeignInvoke(MCScriptFrame*& x_frame, MCScriptInstan`
`1427`	`1426`	`{`
`1428`	`1427`	`// In mode arguments are the value themselves.`
`1429`	`1428`	`t_args[t_arg_index] = t_argument;`
`1430`		`- t_arg_types[t_arg_index] = (ffi_type *)MCForeignTypeInfoGetLayoutType(t_types[t_arg_index] . type);`
`1431`	`1429`	`}`
`1432`	`1430`	`else`
`1433`	`1431`	`{`
`1434`	`1432`	`// Allocate space for the storage pointer`
`1435`	`1433`	`t_args[t_arg_index] = t_invoke_storage.Allocate(sizeof(void *));`
`1436`	`1434`	`(void *)t_args[t_arg_index] = t_argument;`
`1437`		`- t_arg_types[t_arg_index] = &ffi_type_pointer;`
`1438`	`1435`	`}`
`1439`	`1436`	`}`
`1440`	`1437`	`else`
`1441`	`1438`	`{`
`1442`	`1439`	`// Out mode arguments are the contents for foreign values but`
`1443`	`1440`	`// marked 'pointer' type. However, for valuerefs we must make storage`
`1444`	`1441`	`// to put the valueref in.`
`1445`		`- t_arg_types[t_arg_index] = &ffi_type_pointer;`
`1446`		`-`
`1447`	`1442`	`if (t_descriptor != nil)`
`1448`	`1443`	`{`
`1449`	`1444`	`// Allocate space for the storage pointer`