Changeset e56303f for util.c

Timestamp:

Mar 24, 2011, 4:00:33 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

f25df21

Parents:

42ee1be

git-author:

David Benjamin <davidben@mit.edu> (03/08/11 14:44:30)

git-committer:

David Benjamin <davidben@mit.edu> (03/24/11 16:00:33)

Message:

Replace owl_parse_delete with g_strfreev

Also cut the pointless g_strdup in owl_cmddict_execute and allow argc to
be NULL if we don't care about the value.

File:

• util.c (modified) (4 diffs)

util.c

@@ -98 +98 @@
 }
 
-void owl_parse_delete(char **argv, int argc)
-{
-  g_strfreev(argv);
-}
-
+/* Break a command line up into argv, argc.  The caller must free
+   the returned values with g_strfreev.  If there is an error argc will be set
+   to -1, argv will be NULL and the caller does not need to free anything. The
+   returned vector is NULL-terminated. */
 char **owl_parseline(const char *line, int *argc)
 {
-  /* break a command line up into argv, argc.  The caller must free
-     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. The returned vector is NULL-terminated. */
-
   GPtrArray *argv;
   int i, len, between=1;
@@ -119 +113 @@
   curarg = g_string_new("");
   quote='\0';
-  *argc=0;
+  if (argc) *argc=0;
   for (i=0; i<len+1; i++) {
     /* find the first real character */
@@ -170 +164 @@
   }
 
-  *argc = argv->len;
+  if (argc) *argc = argv->len;
   g_ptr_array_add(argv, NULL);
   g_string_free(curarg, true);
@@ -180 +174 @@
     g_ptr_array_foreach(argv, (GFunc)g_free, NULL);
     g_ptr_array_free(argv, true);
-    *argc = -1;
+    if (argc) *argc = -1;
     return(NULL);
   }