mem_calloc -> p_new

[apps/madmutt.git] / rfc1524.c

diff --git a/rfc1524.c b/rfc1524.c
index ad98954..026050f 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -21,7 +21,10 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
+#include "ascii.h"
 #include "rfc1524.h"
 #include "attach.h"
 
@@ -273,7 +276,7 @@ static int rfc1524_mailcap_parse (BODY * a,
               /* a non-zero exit code means test failed */
               found = FALSE;
             }
-            mem_free (&test_command);
+            p_delete(&test_command);
           }
         }
       }                         /* while (ch) */
@@ -298,13 +301,13 @@ static int rfc1524_mailcap_parse (BODY * a,
       if (!found) {
         /* reset */
         if (entry) {
-          mem_free (&entry->command);
-          mem_free (&entry->composecommand);
-          mem_free (&entry->composetypecommand);
-          mem_free (&entry->editcommand);
-          mem_free (&entry->printcommand);
-          mem_free (&entry->nametemplate);
-          mem_free (&entry->convert);
+          p_delete(&entry->command);
+          p_delete(&entry->composecommand);
+          p_delete(&entry->composetypecommand);
+          p_delete(&entry->editcommand);
+          p_delete(&entry->printcommand);
+          p_delete(&entry->nametemplate);
+          p_delete(&entry->convert);
           entry->needsterminal = 0;
           entry->copiousoutput = 0;
         }
@@ -312,27 +315,27 @@ static int rfc1524_mailcap_parse (BODY * a,
     }                           /* while (!found && (buf = mutt_read_line ())) */
     fclose (fp);
   }                             /* if ((fp = fopen ())) */
-  mem_free (&buf);
+  p_delete(&buf);
   return found;
 }
 
 rfc1524_entry *rfc1524_new_entry (void)
 {
-  return (rfc1524_entry *) mem_calloc (1, sizeof (rfc1524_entry));
+  return p_new(rfc1524_entry, 1);
 }
 
 void rfc1524_free_entry (rfc1524_entry ** entry)
 {
   rfc1524_entry *p = *entry;
 
-  mem_free (&p->command);
-  mem_free (&p->testcommand);
-  mem_free (&p->composecommand);
-  mem_free (&p->composetypecommand);
-  mem_free (&p->editcommand);
-  mem_free (&p->printcommand);
-  mem_free (&p->nametemplate);
-  mem_free (entry);
+  p_delete(&p->command);
+  p_delete(&p->testcommand);
+  p_delete(&p->composecommand);
+  p_delete(&p->composetypecommand);
+  p_delete(&p->editcommand);
+  p_delete(&p->printcommand);
+  p_delete(&p->nametemplate);
+  p_delete(entry);
 }
 
 /*
@@ -506,7 +509,7 @@ int rfc1524_expand_filename (char *nametemplate,
     }
   }
 
-  mutt_adv_mktemp (newfile, nflen);
+  mutt_adv_mktemp (NULL, newfile, nflen);
 
   if (rmatch && lmatch)
     return 0;