projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From: David Champion <dgc@uchicago.edu>
[apps/madmutt.git]
/
pgpkey.c
diff --git
a/pgpkey.c
b/pgpkey.c
index
4c476c9
..
640f080
100644
(file)
--- a/
pgpkey.c
+++ b/
pgpkey.c
@@
-13,6
+13,9
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
@@
-450,7
+453,7
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, ADDRESS * p, const char *s)
if (i == keymax) {
keymax += 5;
if (i == keymax) {
keymax += 5;
-
safe
_realloc (&KeyTable, sizeof (pgp_uid_t *) * keymax);
+
mem
_realloc (&KeyTable, sizeof (pgp_uid_t *) * keymax);
}
KeyTable[i++] = a;
}
KeyTable[i++] = a;
@@
-622,7
+625,7
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, ADDRESS * p, const char *s)
}
mutt_menuDestroy (&menu);
}
mutt_menuDestroy (&menu);
-
FREE
(&KeyTable);
+
mem_free
(&KeyTable);
set_option (OPTNEEDREDRAW);
set_option (OPTNEEDREDRAW);
@@
-658,7
+661,7
@@
pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
if (l)
str_replace (&l->dflt, resp);
else {
if (l)
str_replace (&l->dflt, resp);
else {
- l =
safe
_malloc (sizeof (struct pgp_cache));
+ l =
mem
_malloc (sizeof (struct pgp_cache));
l->next = id_defaults;
id_defaults = l;
l->what = str_dup (whatfor);
l->next = id_defaults;
id_defaults = l;
l->what = str_dup (whatfor);
@@
-767,7
+770,7
@@
static LIST *pgp_add_string_to_hints (LIST * hints, const char *str)
hints = mutt_add_list (hints, t);
}
hints = mutt_add_list (hints, t);
}
-
FREE
(&scratch);
+
mem_free
(&scratch);
return hints;
}
return hints;
}