gobject-introspection r864 - in trunk: . girepository

[walters svn gnome org]

Author: walters
Date: Wed Nov  5 22:09:44 2008
New Revision: 864
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=864&view=rev

Log:
Don't use nested scope local variable for error

Modified:
   trunk/ChangeLog
   trunk/girepository/ginvoke.c

Modified: trunk/girepository/ginvoke.c
==============================================================================
--- trunk/girepository/ginvoke.c	(original)
+++ trunk/girepository/ginvoke.c	Wed Nov  5 22:09:44 2008
@@ -163,7 +163,8 @@
   gint n_args, n_invoke_args, in_pos, out_pos, i;
   gpointer *args;
   gboolean success = FALSE;
-  GError *local_error;
+  GError *local_error = NULL;
+  gpointer error_address = &local_error;
 
   symbol = g_function_info_get_symbol (info);
 
@@ -288,11 +289,9 @@
       g_base_info_unref ((GIBaseInfo *)ainfo);
     }
 
-  local_error = NULL;
   if (throws)
     {
-      gpointer address = &local_error;
-      args[n_invoke_args - 1] = &address;
+      args[n_invoke_args - 1] = &error_address;
       atypes[n_invoke_args - 1] = &ffi_type_pointer;
     }