mem_calloc -> p_new

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index d312d46..19b3d8c 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -128,7 +128,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
 
   debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
 
 
   debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
 

-  headers = mem_calloc (hdr_count, sizeof (char *));
+  headers = p_new(char *, hdr_count);

 
   /* Read all the headers into the array */
   while (ftello (in) < off_end) {
 
   /* Read all the headers into the array */
   while (ftello (in) < off_end) {


@@ -938,9 +938,7 @@ static int address_header_decode (char **h)
   mutt_addrlist_to_local (a);
   rfc2047_decode_adrlist (a);
 
   mutt_addrlist_to_local (a);
   rfc2047_decode_adrlist (a);
 

-  *h = mem_calloc (1, l + 2);
-
-  strfcpy (*h, s, l + 1);
+  *h = p_dupstr(s, l + 1);

 
   format_address_header (h, a);
 
 
   format_address_header (h, a);