Changeset d275eb2 for commands.c

Timestamp:

Jan 2, 2011, 3:31:58 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

2bc6ad35

Parents:

f640876

git-author:

David Benjamin <davidben@mit.edu> (12/15/10 13:18:34)

git-committer:

David Benjamin <davidben@mit.edu> (01/02/11 15:31:58)

Message:

Replace atokenize with glib's g_strsplit_set

Glib's had g_strsplit_set since forever, and it does exactly the same
thing as atokenize, modulo needing a pesky NULL check. We may as well
use it.

File:

• commands.c (modified) (3 diffs)

commands.c

@@ -1670 +1670 @@
   char *lastrv = NULL, *newbuff;
   char **commands;
-  int  ncommands, i;
+  int  i;
   if (argc < 2) {
     owl_function_makemsg("Invalid arguments to 'multi' command.");    
@@ -1688 +1688 @@
     }
   }
-  commands = atokenize(newbuff, ";", &ncommands);
-  for (i=0; i<ncommands; i++) {
+  commands = g_strsplit_set(newbuff, ";", 0);
+  for (i = 0; commands[i] != NULL; i++) {
     if (lastrv) {
       owl_free(lastrv);
@@ -1696 +1696 @@
   }
   owl_free(newbuff);
-  atokenize_delete(commands, ncommands);
+  g_strfreev(commands);
   return lastrv;
 }