X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=707a8cb729ec871ab8016d78f83407b8a3f743f1;hp=2508dffda9140aa3a28f494d81defba985464c47;hb=1dc7032b59cc5b91d70076ed228bda8caf65a7f3;hpb=c25bc063f35aaad6938c2022dae7a283346c2769

diff --git a/keymap.c b/keymap.c
index 2508dff..707a8cb 100644
--- a/keymap.c
+++ b/keymap.c
@@ -11,6 +11,9 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "buffer.h"
 #include "ascii.h"
@@ -20,8 +23,6 @@
 #include "mapping.h"
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <stdlib.h>
@@ -93,15 +94,14 @@ int LastKey;
 
 struct keymap_t *Keymaps[MENU_MAX];
 
-static struct keymap_t *allocKeys (int len, keycode_t * keys)
+static struct keymap_t *allocKeys(int len, keycode_t *keys)
 {
-  struct keymap_t *p;
+    struct keymap_t *p;
 
-  p = mem_calloc (1, sizeof (struct keymap_t));
-  p->len = len;
-  p->keys = mem_malloc (len * sizeof (keycode_t));
-  memcpy (p->keys, keys, len * sizeof (keycode_t));
-  return (p);
+    p = p_new(struct keymap_t, 1);
+    p->len  = len;
+    p->keys = p_dup(keys, len);
+    return p;
 }
 
 static int parse_fkey (char *s)
@@ -205,10 +205,10 @@ void km_bind (const char *s, int menu, int op, char *macro, char *descr)
       do {
         len = tmp->eq;
         next = tmp->next;
-        mem_free (&tmp->macro);
-        mem_free (&tmp->keys);
-        mem_free (&tmp->descr);
-        mem_free (&tmp);
+        p_delete(&tmp->macro);
+        p_delete(&tmp->keys);
+        p_delete(&tmp->descr);
+        p_delete(&tmp);
         tmp = next;
       }
       while (tmp && len >= pos);
@@ -712,7 +712,7 @@ static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
     strfcpy (err->data, _("too few arguments"), err->dsize);
   }
 error:
-  mem_free (&buf.data);
+  p_delete(&buf.data);
   return (NULL);
 }
 
@@ -812,7 +812,7 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
       }
     }
   }
-  mem_free (&key);
+  p_delete(&key);
   return (r);
 }
 
@@ -850,7 +850,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
         }
       }
 
-      mem_free (&seq);
+      p_delete(&seq);
     }
     else {
       for (i = 0; i < nummenus; ++i) {
@@ -859,7 +859,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
       }
     }
   }
-  mem_free (&key);
+  p_delete(&key);
   return (r);
 }