# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_idna.h"
#include "mapping.h"
#include "sort.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
{N_("Make Alias"), OP_CREATE_ALIAS},
{N_("Search"), OP_SEARCH},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
/* Variables for outsizing output format */
if (first == NULL) {
FirstColumn = 0;
SecondColumn = 0;
- first = (QUERY *) safe_calloc (1, sizeof (QUERY));
+ first = p_new(QUERY, 1);
cur = first;
}
else {
- cur->next = (QUERY *) safe_calloc (1, sizeof (QUERY));
+ cur->next = p_new(QUERY, 1);
cur = cur->next;
}
}
}
}
- FREE (&buf);
+ p_delete(&buf);
fclose (fp);
if (mutt_wait_filter (thepid)) {
debug_print (1, ("Error: %s\n", msg));
for (queryp = results; queryp; queryp = queryp->next)
menu->max++;
- menu->data = QueryTable =
- (ENTRY *) safe_calloc (menu->max, sizeof (ENTRY));
+ menu->data = QueryTable = p_new(ENTRY, menu->max);
for (i = 0, queryp = results; queryp; queryp = queryp->next, i++)
QueryTable[i].data = queryp;
queryp = results;
while (queryp) {
rfc822_free_address (&queryp->addr);
- FREE (&queryp->name);
- FREE (&queryp->other);
+ p_delete(&queryp->name);
+ p_delete(&queryp->other);
results = queryp->next;
- FREE (&queryp);
+ p_delete(&queryp);
queryp = results;
}
results = newresults;
- FREE (&QueryTable);
+ p_delete(&QueryTable);
}
else {
/* append */
menu->max++;
if (op == OP_QUERY) {
- menu->data = QueryTable =
- (ENTRY *) safe_calloc (menu->max, sizeof (ENTRY));
+ menu->data = QueryTable = p_new(ENTRY, menu->max);
for (i = 0, queryp = results; queryp;
queryp = queryp->next, i++)
int clear = 0;
/* append */
- safe_realloc (&QueryTable, menu->max * sizeof (ENTRY));
+ p_realloc(&QueryTable, menu->max);
menu->data = QueryTable;
queryp = results;
while (queryp) {
rfc822_free_address (&queryp->addr);
- FREE (&queryp->name);
- FREE (&queryp->other);
+ p_delete(&queryp->name);
+ p_delete(&queryp->other);
results = queryp->next;
- FREE (&queryp);
+ p_delete(&queryp);
queryp = results;
}
- FREE (&QueryTable);
+ p_delete(&QueryTable);
/* tell whoever called me to redraw the screen when I return */
set_option (OPTNEEDREDRAW);