#include <stdlib.h>
#include "mutt.h"
+#include "ascii.h"
#include "mutt_idna.h"
#include "lib/mem.h"
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);
}
}
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);
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;
}
}