Changeset 6965867 for util.c

Timestamp:

Feb 9, 2011, 10:59:56 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

3f82515

Parents:

8061a6a

git-author:

David Benjamin <davidben@mit.edu> (02/06/11 23:01:14)

git-committer:

David Benjamin <davidben@mit.edu> (02/09/11 22:59:56)

Message:

g_ptr_array_new_with_free_func is glib 2.22+

Use g_ptr_array_foreach instead.

Reported-by: Adam Glasgall <adam@crossproduct.net>

File:

• util.c (modified) (2 diffs)

util.c

@@ -115 +115 @@
   char quote;
 
-  argv = g_ptr_array_new_with_free_func(owl_free);
+  argv = g_ptr_array_new();
   len=strlen(line);
   curarg = g_string_new("");
@@ -176 +176 @@
   /* check for unbalanced quotes */
   if (quote!='\0') {
+    /* TODO: when we move to requiring glib 2.22+, use
+     * g_ptr_array_new_with_free_func. */
+    g_ptr_array_foreach(argv, (GFunc)owl_free, NULL);
     g_ptr_array_free(argv, true);
     *argc = -1;