Changeset e56303f for cmd.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:

• cmd.c (modified) (3 diffs)

cmd.c

@@ -85 +85 @@
   char **argv;
   int argc;
-  char *tmpbuff;
   char *retval = NULL;
 
-  tmpbuff=g_strdup(cmdbuff);
-  argv=owl_parseline(tmpbuff, &argc);
-  if (argc < 0) {
-    g_free(tmpbuff);
+  argv = owl_parseline(cmdbuff, &argc);
+  if (argv == NULL) {
     owl_function_makemsg("Unbalanced quotes");
     return NULL;
@@ -97 +94 @@
   
   if (argc < 1) {
-    owl_parse_delete(argv, argc);
-    g_free(tmpbuff);
+    g_strfreev(argv);
     return NULL;
   }
@@ -104 +100 @@
   retval = _owl_cmddict_execute(cd, ctx, strs(argv), argc, cmdbuff);
 
-  owl_parse_delete(argv, argc);
-  g_free(tmpbuff);
+  g_strfreev(argv);
   return retval;
 }