X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpkey.c;h=38048174bc6657a845f1a457e2142bc03fc19922;hp=4c476c93f4fc8d2d74cfa0f1c8506bc08d64e5ed;hb=75291cb065ec25499a125665cba1123ee4c64abf;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/pgpkey.c b/pgpkey.c
index 4c476c9..3804817 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -13,6 +13,9 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
+#include "recvattach.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;
-        safe_realloc (&KeyTable, sizeof (pgp_uid_t *) * keymax);
+        mem_realloc (&KeyTable, sizeof (pgp_uid_t *) * keymax);
       }
 
       KeyTable[i++] = a;
@@ -578,7 +581,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, ADDRESS * p, const char *s)
       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)
@@ -622,7 +625,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, ADDRESS * p, const char *s)
   }
 
   mutt_menuDestroy (&menu);
-  FREE (&KeyTable);
+  mem_free (&KeyTable);
 
   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 {
-        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);
@@ -767,7 +770,7 @@ static LIST *pgp_add_string_to_hints (LIST * hints, const char *str)
       hints = mutt_add_list (hints, t);
   }
 
-  FREE (&scratch);
+  mem_free (&scratch);
   return hints;
 }