# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include "pager.h"
#include "sort.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
if (i == keymax) {
keymax += 5;
- mem_realloc (&KeyTable, sizeof (pgp_uid_t *) * keymax);
+ p_realloc(&KeyTable, keymax);
}
KeyTable[i++] = a;
if (option (OPTPGPCHECKTRUST) &&
(!pgp_id_is_valid (KeyTable[menu->current])
|| !pgp_id_is_strong (KeyTable[menu->current]))) {
- char *s = "";
+ const char *s = "";
char buff[LONG_STRING];
if (KeyTable[menu->current]->flags & KEYFLAG_CANTUSE)
}
mutt_menuDestroy (&menu);
- mem_free (&KeyTable);
+ p_delete(&KeyTable);
set_option (OPTNEEDREDRAW);
if (l)
str_replace (&l->dflt, resp);
else {
- l = mem_malloc (sizeof (struct pgp_cache));
+ l = p_new(struct pgp_cache, 1);
l->next = id_defaults;
id_defaults = l;
l->what = str_dup (whatfor);
hints = mutt_add_list (hints, t);
}
- mem_free (&scratch);
+ p_delete(&scratch);
return hints;
}