Changeset 1672650

Timestamp:

Mar 7, 2010, 10:25:09 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

40d22cf

Parents:

43e8bb2

git-author:

Anders Kaseorg <andersk@mit.edu> (02/27/10 20:03:38)

git-committer:

Anders Kaseorg <andersk@mit.edu> (03/07/10 22:25:09)

Message:

Rename atokenize_free to atokenize_delete.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Nelson Elhage <nelhage@mit.edu>

Files:

• commands.c (modified) (1 diff)
• keybinding.c (modified) (3 diffs)
• util.c (modified) (1 diff)
• variable.c (modified) (3 diffs)

commands.c

@@ -1632 +1632 @@
   }
   owl_free(newbuff);
-  atokenize_free(commands, ncommands);
+  atokenize_delete(commands, ncommands);
   return lastrv;
 }

keybinding.c

@@ -29 +29 @@
   if (!ktokens) return(-1);
   if (nktokens > OWL_KEYMAP_MAXSTACK) {
-    atokenize_free(ktokens, nktokens);
+    atokenize_delete(ktokens, nktokens);
     return(-1);
   }
@@ -36 +36 @@
     kb->keys[i] = owl_keypress_fromstring(ktokens[i]);
     if (kb->keys[i] == ERR) { 
-      atokenize_free(ktokens, nktokens);
+      atokenize_delete(ktokens, nktokens);
       owl_free(kb->keys);
       return(-1);
@@ -43 +43 @@
   kb->len = nktokens;
 
-  atokenize_free(ktokens, nktokens);
+  atokenize_delete(ktokens, nktokens);
 
   if (command) kb->command = owl_strdup(command);

util.c

@@ -239 +239 @@
 }
 
-void atokenize_free(char **tok, int nels)
+void atokenize_delete(char **tok, int nels)
 {
   int i;

variable.c

@@ -929 +929 @@
   enums = atokenize(v->validsettings, ",", &nenums);
   if (enums == NULL) return(0);
-  atokenize_free(enums, nenums);
+  atokenize_delete(enums, nenums);
   val = *(const int*)newval;
   if (val < 0 || val >= nenums) {
@@ -948 +948 @@
     }
   }
-  atokenize_free(enums, nenums);
+  atokenize_delete(enums, nenums);
   if (val == -1) return(-1);
   return (v->set_fn(v, &val));
@@ -965 +965 @@
   if (i<0 || i>=nenums) {
     snprintf(buf, bufsize, "<invalid:%d>",i);
-    atokenize_free(enums, nenums);
+    atokenize_delete(enums, nenums);
     return(-1);
   }
   snprintf(buf, bufsize, "%s", enums[i]);
-  atokenize_free(enums, nenums);
+  atokenize_delete(enums, nenums);
   return 0;
 }