# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "buffer.h"
#include "ascii.h"
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)
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);
strfcpy (err->data, _("too few arguments"), err->dsize);
}
error:
- mem_free (&buf.data);
+ p_delete(&buf.data);
return (NULL);
}
}
}
}
- mem_free (&key);
+ p_delete(&key);
return (r);
}
}
}
- mem_free (&seq);
+ p_delete(&seq);
}
else {
for (i = 0; i < nummenus; ++i) {
}
}
}
- mem_free (&key);
+ p_delete(&key);
return (r);
}