Changeset f9325e9

Timestamp:

Jan 5, 2013, 4:01:18 PM (11 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Parents:

048b1ff (diff), 6f14b20 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 6f14b20022e0a3d8b14f536d7f2e22a4cc88eb64 into 048b1ff9986fa6f3572985dbf44dd262dcd81618

File:

• util.c (modified) (2 diffs)

util.c

@@ -95 +95 @@
 }
 
-void owl_ptr_array_free(GPtrArray *array, GDestroyNotify element_free_func)
-{
-  /* TODO: when we move to requiring glib 2.22+, use
-   * g_ptr_array_new_with_free_func instead. */
-  if (element_free_func)
+void owl_ptr_array_free(GPtrArray *array, GDestroyNotify element_free_func) {
+  if (element_free_func) {
+#if GLIB_CHECK_VERSION(2, 22, 0)
+    g_ptr_array_set_free_func(array, element_free_func);
+#else
     g_ptr_array_foreach(array, (GFunc)element_free_func, NULL);
+#endif
+  }
   g_ptr_array_free(array, true);
 }
@@ -116 +118 @@
 
   argv = g_ptr_array_new();
-  len=strlen(line);
+  len = strlen(line);
   curarg = g_string_new("");
   quote='\0';