luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use G_VA_COPY instead of va_copy()

Browse Source 
va_vopy() is not universally available in all compilers, so make use of
the existing G_VA_COPY macro which either calls va_copy() if it is
available, or emulates it if otherwise.
This commit is contained in:
Chun-wei Fan 2012-03-08 14:51:22 +08:00
parent 75ca1cd158
commit b72bb9dd08
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gobject/gclosure.c
View File

@ -1511,7 +1511,7 @@ g_cclosure_marshal_generic_va (GClosure *closure,
args[n_args-1] = &closure->data; args[n_args-1] = &closure->data;
} }
va_copy (args_copy, args_list); G_VA_COPY (args_copy, args_list);
/* Box non-primitive arguments */ /* Box non-primitive arguments */
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)

42
gobject/gmarshal.c
View File

@ -169,7 +169,7 @@ g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
gboolean arg0; gboolean arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gboolean) va_arg (args_copy, gboolean); arg0 = (gboolean) va_arg (args_copy, gboolean);
va_end (args_copy); va_end (args_copy);
@ -243,7 +243,7 @@ g_cclosure_marshal_VOID__CHARv (GClosure *closure,
gchar arg0; gchar arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gchar) va_arg (args_copy, gint); arg0 = (gchar) va_arg (args_copy, gint);
va_end (args_copy); va_end (args_copy);
@ -317,7 +317,7 @@ g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
guchar arg0; guchar arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (guchar) va_arg (args_copy, guint); arg0 = (guchar) va_arg (args_copy, guint);
va_end (args_copy); va_end (args_copy);
@ -391,7 +391,7 @@ g_cclosure_marshal_VOID__INTv (GClosure *closure,
gint arg0; gint arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gint) va_arg (args_copy, gint); arg0 = (gint) va_arg (args_copy, gint);
va_end (args_copy); va_end (args_copy);
@ -465,7 +465,7 @@ g_cclosure_marshal_VOID__UINTv (GClosure *closure,
guint arg0; guint arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (guint) va_arg (args_copy, guint); arg0 = (guint) va_arg (args_copy, guint);
va_end (args_copy); va_end (args_copy);
@ -539,7 +539,7 @@ g_cclosure_marshal_VOID__LONGv (GClosure *closure,
glong arg0; glong arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (glong) va_arg (args_copy, glong); arg0 = (glong) va_arg (args_copy, glong);
va_end (args_copy); va_end (args_copy);
@ -613,7 +613,7 @@ g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
gulong arg0; gulong arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gulong) va_arg (args_copy, gulong); arg0 = (gulong) va_arg (args_copy, gulong);
va_end (args_copy); va_end (args_copy);
@ -687,7 +687,7 @@ g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
gint arg0; gint arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gint) va_arg (args_copy, gint); arg0 = (gint) va_arg (args_copy, gint);
va_end (args_copy); va_end (args_copy);
@ -761,7 +761,7 @@ g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
guint arg0; guint arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (guint) va_arg (args_copy, guint); arg0 = (guint) va_arg (args_copy, guint);
va_end (args_copy); va_end (args_copy);
@ -835,7 +835,7 @@ g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
gfloat arg0; gfloat arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gfloat) va_arg (args_copy, gdouble); arg0 = (gfloat) va_arg (args_copy, gdouble);
va_end (args_copy); va_end (args_copy);
@ -909,7 +909,7 @@ g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
gdouble arg0; gdouble arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gdouble) va_arg (args_copy, gdouble); arg0 = (gdouble) va_arg (args_copy, gdouble);
va_end (args_copy); va_end (args_copy);
@ -983,7 +983,7 @@ g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
gpointer arg0; gpointer arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
arg0 = g_strdup (arg0); arg0 = g_strdup (arg0);
@ -1061,7 +1061,7 @@ g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
gpointer arg0; gpointer arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
arg0 = g_param_spec_ref (arg0); arg0 = g_param_spec_ref (arg0);
@ -1139,7 +1139,7 @@ g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
gpointer arg0; gpointer arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
arg0 = g_boxed_copy (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0); arg0 = g_boxed_copy (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);
@ -1217,7 +1217,7 @@ g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
gpointer arg0; gpointer arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
va_end (args_copy); va_end (args_copy);
@ -1291,7 +1291,7 @@ g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
gpointer arg0; gpointer arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
if (arg0 != NULL) if (arg0 != NULL)
arg0 = g_object_ref (arg0); arg0 = g_object_ref (arg0);
@ -1369,7 +1369,7 @@ g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
gpointer arg0; gpointer arg0;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
arg0 = g_variant_ref_sink (arg0); arg0 = g_variant_ref_sink (arg0);
@ -1451,7 +1451,7 @@ g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
gpointer arg1; gpointer arg1;
va_list args_copy; va_list args_copy;
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (guint) va_arg (args_copy, guint); arg0 = (guint) va_arg (args_copy, guint);
arg1 = (gpointer) va_arg (args_copy, gpointer); arg1 = (gpointer) va_arg (args_copy, gpointer);
va_end (args_copy); va_end (args_copy);
@ -1534,7 +1534,7 @@ g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
g_return_if_fail (return_value != NULL); g_return_if_fail (return_value != NULL);
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (guint) va_arg (args_copy, guint); arg0 = (guint) va_arg (args_copy, guint);
va_end (args_copy); va_end (args_copy);
@ -1621,7 +1621,7 @@ g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
g_return_if_fail (return_value != NULL); g_return_if_fail (return_value != NULL);
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
if (arg0 != NULL) if (arg0 != NULL)
arg0 = g_object_ref (arg0); arg0 = g_object_ref (arg0);
@ -1714,7 +1714,7 @@ g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure,
g_return_if_fail (return_value != NULL); g_return_if_fail (return_value != NULL);
va_copy (args_copy, args); G_VA_COPY (args_copy, args);
arg0 = (gpointer) va_arg (args_copy, gpointer); arg0 = (gpointer) va_arg (args_copy, gpointer);
if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
arg0 = g_boxed_copy (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0); arg0 = g_boxed_copy (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);