Changeset d275eb2 for keybinding.c

Timestamp:

Jan 2, 2011, 3:31:58 PM (13 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:

• keybinding.c (modified) (3 diffs)

keybinding.c

@@ -39 +39 @@
   int    nktokens, i;
 
-  ktokens = atokenize(keyseq, " ", &nktokens);
-  if (!ktokens) return(-1);
-  if (nktokens > OWL_KEYMAP_MAXSTACK) {
-    atokenize_delete(ktokens, nktokens);
+  ktokens = g_strsplit_set(keyseq, " ", 0);
+  nktokens = g_strv_length(ktokens);
+  if (nktokens < 1 || nktokens > OWL_KEYMAP_MAXSTACK) {
+    g_strfreev(ktokens);
     return(-1);
   }
@@ -48 +48 @@
   for (i=0; i<nktokens; i++) {
     kb->keys[i] = owl_keypress_fromstring(ktokens[i]);
-    if (kb->keys[i] == ERR) { 
-      atokenize_delete(ktokens, nktokens);
+    if (kb->keys[i] == ERR) {
+      g_strfreev(ktokens);
       owl_free(kb->keys);
       return(-1);
@@ -55 +55 @@
   }
   kb->len = nktokens;
-  atokenize_delete(ktokens, nktokens);
+  g_strfreev(ktokens);
   return(0);
 }