Changeset b13daa0

Timestamp:

Mar 24, 2011, 4:09:22 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

45e2c95

Parents:

c809f5e

git-author:

David Benjamin <davidben@mit.edu> (03/10/11 15:14:32)

git-committer:

David Benjamin <davidben@mit.edu> (03/24/11 16:09:22)

Message:

Make owl_keybinding new/delete instead of init/cleanup

Valgrind is deeply disappointed in this code...

Hide owl_keybinding_make_keys again, so we don't construct half-baked
owl_keybinding instances. Instead allow for creating a dummy keybinding.
Also, initialize all fields of owl_keybinding, or freeing it afterwards
explodes. Also fix a memory leak in unbindkey.

Files:

• keybinding.c (modified) (2 diffs)
• keymap.c (modified) (3 diffs)
• owl.h (modified) (1 diff)

keybinding.c

@@ -11 +11 @@
  */
 
+static int owl_keybinding_make_keys(owl_keybinding *kb, const char *keyseq);
+
 /* sets up a new keybinding for a command */
-int owl_keybinding_init(owl_keybinding *kb, const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
+owl_keybinding *owl_keybinding_new(const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
+  owl_keybinding *kb = g_new(owl_keybinding, 1);
+
   owl_function_debugmsg("owl_keybinding_init: creating binding for <%s> with desc: <%s>", keyseq, desc);
-  if (command && !function_fn) {
+  if (command && function_fn) {
+    g_free(kb);
+    return NULL;
+  } else if (command && !function_fn) {
     kb->type = OWL_KEYBINDING_COMMAND;
   } else if (!command && function_fn) {
     kb->type = OWL_KEYBINDING_FUNCTION;
   } else {
-    return(-1);
+    kb->type = OWL_KEYBINDING_NOOP;
   }
 
   if (owl_keybinding_make_keys(kb, keyseq) != 0) {
-    return(-1);
+    g_free(kb);
+    return NULL;
   }
 
-  if (command) kb->command = g_strdup(command);
+  kb->command = g_strdup(command);
   kb->function_fn = function_fn;
-  if (desc) kb->desc = g_strdup(desc);
-  else kb->desc = NULL;
-  return(0);
+  kb->desc = g_strdup(desc);
+  return kb;
 }
 
-int owl_keybinding_make_keys(owl_keybinding *kb, const char *keyseq)
+static int owl_keybinding_make_keys(owl_keybinding *kb, const char *keyseq)
 {
   char **ktokens;
@@ -59 +66 @@
 }
 
-/* Releases data associated with a keybinding */
-void owl_keybinding_cleanup(owl_keybinding *kb)
+/* Releases data associated with a keybinding, and the kb itself */
+void owl_keybinding_delete(owl_keybinding *kb)
 {
   if (kb->keys) g_free(kb->keys);
   if (kb->desc) g_free(kb->desc);
   if (kb->command) g_free(kb->command);
-}
-
-/* Releases data associated with a keybinding, and the kb itself */
-void owl_keybinding_delete(owl_keybinding *kb)
-{
-  owl_keybinding_cleanup(kb);
   g_free(kb);
 }

keymap.c

@@ -38 +38 @@
   int i;
 
-  if ((kb = g_new(owl_keybinding, 1)) == NULL) return(-1);
-  if (0 != owl_keybinding_init(kb, keyseq, command, function_fn, desc)) {
-    g_free(kb);
-    return(-1);
-  }
+  kb = owl_keybinding_new(keyseq, command, function_fn, desc);
+  if (kb == NULL)
+    return -1;
   /* see if another matching binding, and if so remove it.
    * otherwise just add this one. 
@@ -63 +61 @@
   int i;
 
-  if ((kb = g_new(owl_keybinding, 1)) == NULL) return(-1);
-  if (0 != owl_keybinding_make_keys(kb, keyseq)) {
-    g_free(kb);
-    return(-1);
-  }
+  kb = owl_keybinding_new(keyseq, NULL, NULL, NULL);
+  if (kb == NULL)
+    return -1;
 
   for (i = owl_list_get_size(&km->bindings)-1; i >= 0; i--) {
@@ -74 +70 @@
       owl_list_remove_element(&km->bindings, i);
       owl_keybinding_delete(curkb);
+      owl_keybinding_delete(kb);
       return(0);
     }
   }
+  owl_keybinding_delete(kb);
   return(-2);
 }

owl.h

@@ -186 +186 @@
 #define OWL_KEYMAP_MAXSTACK     20
 
+#define OWL_KEYBINDING_NOOP     0   /* dummy binding that does nothing */
 #define OWL_KEYBINDING_COMMAND  1   /* command string */
 #define OWL_KEYBINDING_FUNCTION 2   /* function taking no args */