X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=6181c7369375f667ba4a2ed8fcee941dec931914;hp=8f934b49f48a0522b8d37fee5573c6c2c6bc4902;hb=49f1156410e9a037404101696d37b2c0d5c67564;hpb=1f2995420ee1612199ab8af9909159a2a8afbdab

diff --git a/remailer.c b/remailer.c
index 8f934b4..6181c73 100644
--- a/remailer.c
+++ b/remailer.c
@@ -15,6 +15,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "mutt_curses.h"
@@ -113,16 +115,16 @@ static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
 
 static REMAILER *mix_new_remailer (void)
 {
-  return mem_calloc (1, sizeof (REMAILER));
+  return p_new(REMAILER, 1);
 }
 
 static void mix_free_remailer (REMAILER ** r)
 {
-  mem_free (&(*r)->shortname);
-  mem_free (&(*r)->addr);
-  mem_free (&(*r)->ver);
+  p_delete(&(*r)->shortname);
+  p_delete(&(*r)->addr);
+  p_delete(&(*r)->ver);
 
-  mem_free (r);
+  p_delete(r);
 }
 
 /* parse the type2.list as given by mixmaster -T */
@@ -212,7 +214,7 @@ static void mix_free_type2_list (REMAILER *** ttlp)
   for (i = 0; type2_list[i]; i++)
     mix_free_remailer (&type2_list[i]);
 
-  mem_free (type2_list);
+  p_delete(type2_list);
 }
 
 
@@ -484,7 +486,7 @@ void mix_make_chain (LIST ** chainp, int *redraw)
   int op;
 
   int i, j;
-  char *t;
+  const char *t;
 
   if (!(type2_list = mix_type2_list (&ttll))) {
     mutt_error _("Can't get mixmaster's type2.list!");
@@ -494,7 +496,7 @@ void mix_make_chain (LIST ** chainp, int *redraw)
 
   *redraw = REDRAW_FULL;
 
-  chain = mem_calloc (sizeof (MIXCHAIN), 1);
+  chain = p_new(MIXCHAIN, 1);
   for (p = *chainp; p; p = p->next)
     mix_chain_add (chain, (char *) p->data, type2_list);
 
@@ -661,8 +663,8 @@ void mix_make_chain (LIST ** chainp, int *redraw)
   }
 
   mix_free_type2_list (&type2_list);
-  mem_free (&coords);
-  mem_free (&chain);
+  p_delete(&coords);
+  p_delete(&chain);
 }
 
 /* some safety checks before piping the message to mixmaster */