Changeset d275eb2 for util.c

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, 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:

• util.c (modified) (2 diffs)

util.c

@@ -11 +11 @@
 #include <glib/gstdio.h>
 #include <glib-object.h>
-
-char **atokenize(const char *buffer, const char *sep, int *i)
-{
-  /* each element of return must be freed by user */
-  char **args;
-  char *workbuff, *foo;
-  int done=0, first=1, count=0;
-
-  workbuff = owl_strdup(buffer);
-
-  args=NULL;
-  while (!done) {
-    if (first) {
-      first=0;
-      foo=strtok(workbuff, sep);
-    } else {
-      foo=strtok(NULL, sep);
-    }
-    if (foo==NULL) {
-      done=1;
-    } else {
-      args=owl_realloc(args, sizeof(char *) * (count+1));
-      args[count] = owl_strdup(foo);
-      count++;
-    }
-  }
-  *i=count;
-  owl_free(workbuff);
-  return(args);
-}
 
 const char *skiptokens(const char *buff, int n) {
@@ -127 +97 @@
 }
 
-void atokenize_delete(char **tok, int nels)
-{
-  int i;
-  for (i=0; i<nels; i++) {
-    owl_free(tok[i]);
-  }
-  owl_free(tok);
-}
-
-
 void owl_parse_delete(char **argv, int argc)
 {