Created a macro of the va_arg parsing function because some systems (PPC) cannot...

Original commit message from CVS:
Created a macro of the va_arg parsing function because some systems (PPC)
cannot handle passing a va_list by reference.

diff --git a/gst/gstprops.c b/gst/gstprops.c
index 096beae..25d5a24 100644 (file)
--- a/gst/gstprops.c
+++ b/gst/gstprops.c
@@ -93,39 +93,41 @@ props_find_func (gconstpointer a,
   return (entry1 - entry2->propid);
 }
 
-static void
-gst_props_entry_fill (GstPropsEntry *entry, va_list *var_args)
-{
-  entry->propstype = va_arg (*var_args, GstPropsId);
-
-  switch (entry->propstype) {
-    case GST_PROPS_INT_ID:
-      entry->data.int_data = va_arg (*var_args, gint);
-      break;
-    case GST_PROPS_INT_RANGE_ID:
-      entry->data.int_range_data.min = va_arg (*var_args, gint);
-      entry->data.int_range_data.max = va_arg (*var_args, gint);
-      break;
-    case GST_PROPS_FLOAT_ID:
-      entry->data.float_data = va_arg (*var_args, gdouble);
-      break;
-    case GST_PROPS_FLOAT_RANGE_ID:
-      entry->data.float_range_data.min = va_arg (*var_args, gdouble);
-      entry->data.float_range_data.max = va_arg (*var_args, gdouble);
-      break;
-    case GST_PROPS_FOURCC_ID:
-      entry->data.fourcc_data = va_arg (*var_args, gulong);
-      break;
-    case GST_PROPS_BOOL_ID:
-      entry->data.bool_data = va_arg (*var_args, gboolean);
-      break;
-    case GST_PROPS_STRING_ID:
-      entry->data.string_data.string = g_strdup (va_arg (*var_args, gchar*));
-      break;
-    default:
-      break;
-  }
-}
+/* This is implemented as a huge macro because we cannot pass
+ * va_list variables by reference on some architectures.
+ */
+#define GST_PROPS_ENTRY_FILL(entry, var_args)                                  \
+G_STMT_START {                                                                         \
+  entry->propstype = va_arg (var_args, GstPropsId);                            \
+                                                                               \
+  switch (entry->propstype) {                                                  \
+    case GST_PROPS_INT_ID:                                                     \
+      entry->data.int_data = va_arg (var_args, gint);                          \
+      break;                                                                   \
+    case GST_PROPS_INT_RANGE_ID:                                               \
+      entry->data.int_range_data.min = va_arg (var_args, gint);                        \
+      entry->data.int_range_data.max = va_arg (var_args, gint);                        \
+      break;                                                                   \
+    case GST_PROPS_FLOAT_ID:                                                   \
+      entry->data.float_data = va_arg (var_args, gdouble);                     \
+      break;                                                                   \
+    case GST_PROPS_FLOAT_RANGE_ID:                                             \
+      entry->data.float_range_data.min = va_arg (var_args, gdouble);           \
+      entry->data.float_range_data.max = va_arg (var_args, gdouble);           \
+      break;                                                                   \
+    case GST_PROPS_FOURCC_ID:                                                  \
+      entry->data.fourcc_data = va_arg (var_args, gulong);                     \
+      break;                                                                   \
+    case GST_PROPS_BOOL_ID:                                                    \
+      entry->data.bool_data = va_arg (var_args, gboolean);                     \
+      break;                                                                   \
+    case GST_PROPS_STRING_ID:                                                  \
+      entry->data.string_data.string = g_strdup (va_arg (var_args, gchar*));   \
+      break;                                                                   \
+    default:                                                                   \
+      break;                                                                   \
+  }                                                                            \
+} G_STMT_END
 
 /**
  * gst_props_new:
@@ -186,7 +188,7 @@ gst_props_newv (const gchar *firstname, va_list var_args)
     g_mutex_unlock (_gst_props_entries_chunk_lock);
 
     entry->propid = g_quark_from_string (prop_name);
-    gst_props_entry_fill (entry, &var_args);
+    GST_PROPS_ENTRY_FILL (entry, var_args);
 
     switch (entry->propstype) {
       case GST_PROPS_INT_ID:
@@ -258,7 +260,7 @@ gst_props_set (GstProps *props, const gchar *name, ...)
 
     va_start (var_args, name);
 
-    gst_props_entry_fill (entry, &var_args);
+    GST_PROPS_ENTRY_FILL (entry, var_args);
 
     va_end (var_args);
   }