X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc822.c;h=5dc33e2bb1b358622c2d15f61b1e1d5a3aca2ce2;hp=618e37bc287d3cf3bc4b51d5522857d78deff656;hb=47a98766051a91ceb5e60f7ff5eedc40ea161d61;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/rfc822.c b/rfc822.c
index 618e37b..5dc33e2 100644
--- a/rfc822.c
+++ b/rfc822.c
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 
 #include "mutt.h"
+#include "ascii.h"
 #include "mutt_idna.h"
 
 #include "lib/mem.h"
@@ -70,9 +71,9 @@ void rfc822_free_address (ADDRESS ** p)
   while (*p) {
     t = *p;
     *p = (*p)->next;
-    FREE (&t->personal);
-    FREE (&t->mailbox);
-    FREE (&t);
+    mem_free (&t->personal);
+    mem_free (&t->mailbox);
+    mem_free (&t);
   }
 }
 
@@ -389,7 +390,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
       cur = rfc822_new_address ();
       if (phraselen) {
         if (cur->personal)
-          FREE (&cur->personal);
+          mem_free (&cur->personal);
         /* if we get something like "Michael R. Elkins" remove the quotes */
         rfc822_dequote_comment (phrase);
         cur->personal = str_dup (phrase);
@@ -446,9 +447,9 @@ void rfc822_qualify (ADDRESS * addr, const char *host)
 
   for (; addr; addr = addr->next)
     if (!addr->group && addr->mailbox && strchr (addr->mailbox, '@') == NULL) {
-      p = safe_malloc (str_len (addr->mailbox) + str_len (host) + 2);
+      p = mem_malloc (str_len (addr->mailbox) + str_len (host) + 2);
       sprintf (p, "%s@%s", addr->mailbox, host);        /* __SPRINTF_CHECKED__ */
-      FREE (&addr->mailbox);
+      mem_free (&addr->mailbox);
       addr->mailbox = p;
     }
 }