Changeset 65c753e for util.c

Timestamp:

Feb 4, 2011, 3:49:44 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

fc7481a

Parents:

d3941a0

git-author:

David Benjamin <davidben@mit.edu> (01/24/11 19:38:53)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 15:49:44)

Message:

Use a GPtrArray to manage the growing list in owl_parseline

It's much nicer than dealing with piles of owl_realloc. Also ensure that
our argvs are NULL-terminated so we may used the various *v glib
functions.

File:

• util.c (modified) (4 diffs)

util.c

@@ -100 +100 @@
 void owl_parse_delete(char **argv, int argc)
 {
-  int i;
-
-  if (!argv) return;
-  
-  for (i=0; i<argc; i++) {
-    if (argv[i]) owl_free(argv[i]);
-  }
-  owl_free(argv);
+  g_strfreev(argv);
 }
 
@@ -115 +108 @@
      the returned values.  If there is an error argc will be set to
      -1, argv will be NULL and the caller does not need to free
-     anything */
-
-  char **argv;
+     anything. The returned vector is NULL-terminated. */
+
+  GPtrArray *argv;
   int i, len, between=1;
   char *curarg;
   char quote;
 
-  argv=owl_malloc(sizeof(char *));
+  argv = g_ptr_array_new_with_free_func(owl_free);
   len=strlen(line);
   curarg=owl_malloc(len+10);
@@ -170 +163 @@
     if (quote=='\0') {
       /* add the argument */
-      argv=owl_realloc(argv, sizeof(char *)*((*argc)+1));
-      argv[*argc] = owl_strdup(curarg);
-      *argc=*argc+1;
+      g_ptr_array_add(argv, owl_strdup(curarg));
       strcpy(curarg, "");
       between=1;
@@ -183 +174 @@
   }
 
+  *argc = argv->len;
+  g_ptr_array_add(argv, NULL);
   owl_free(curarg);
 
   /* check for unbalanced quotes */
   if (quote!='\0') {
-    owl_parse_delete(argv, *argc);
-    *argc=-1;
+    g_ptr_array_free(argv, true);
+    *argc = -1;
     return(NULL);
   }
 
-  return(argv);
+  return (char**)g_ptr_array_free(argv, false);
 }