Changeset b13daa0 for keymap.c

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.

File:

• keymap.c (modified) (3 diffs)

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);
 }