#include <string.h>
#include <ctype.h>
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "lib/str.h"
#include "lib/rx.h"
#include "lib/debug.h"
}
if (!i) {
- u = mem_malloc (sizeof (LIST));
+ u = p_new(LIST, 1);
u->data = str_dup (a->mailbox);
u->next = *expn;
*expn = u;
}
}
- new = mem_calloc (1, sizeof (ALIAS));
+ new = p_new(ALIAS, 1);
new->self = new;
new->name = str_dup (buf);
while (a) {
if (a->name && (strstr (a->name, s) == a->name)) {
if (!a_list) /* init */
- a_cur = a_list = (ALIAS *) mem_malloc (sizeof (ALIAS));
+ a_cur = a_list = p_new(ALIAS, 1);
else {
- a_cur->next = (ALIAS *) mem_malloc (sizeof (ALIAS));
+ a_cur->next = p_new(ALIAS, 1);
a_cur = a_cur->next;
}
memcpy (a_cur, a, sizeof (ALIAS));
while (a_list) {
a_cur = a_list;
a_list = a_list->next;
- mem_free (&a_cur);
+ p_delete(&a_cur);
}
/* remove any aliases marked for deletion */
menu->max++;
}
- mem_realloc (&AliasTable, menu->max * sizeof (ALIAS *));
+ p_realloc(&AliasTable, menu->max);
menu->data = AliasTable;
for (i = omax, aliasp = aliases; aliasp; aliasp = aliasp->next, i++) {
}
mutt_menuDestroy (&menu);
- mem_free (&AliasTable);
+ p_delete(&AliasTable);
}