X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=70b31ace20f2bfa186126043ba2e18c8ef6c415d;hp=783ee59da3c264a7360ddc6a9507aec214c497c5;hb=144d971350da85e57d24db87c09fd9cc0dcf22f2;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/remailer.c b/remailer.c
index 783ee59..70b31ac 100644
--- a/remailer.c
+++ b/remailer.c
@@ -16,6 +16,7 @@
 #endif
 
 #include "mutt.h"
+#include "recvattach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mapping.h"
@@ -100,7 +101,7 @@ static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
 {
   if (*used == *slots) {
     *slots += 5;
-    safe_realloc (type2_list, sizeof (REMAILER *) * (*slots));
+    mem_realloc (type2_list, sizeof (REMAILER *) * (*slots));
   }
 
   (*type2_list)[(*used)++] = entry;
@@ -110,16 +111,16 @@ static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
 
 static REMAILER *mix_new_remailer (void)
 {
-  return safe_calloc (1, sizeof (REMAILER));
+  return mem_calloc (1, sizeof (REMAILER));
 }
 
 static void mix_free_remailer (REMAILER ** r)
 {
-  FREE (&(*r)->shortname);
-  FREE (&(*r)->addr);
-  FREE (&(*r)->ver);
+  mem_free (&(*r)->shortname);
+  mem_free (&(*r)->addr);
+  mem_free (&(*r)->ver);
 
-  FREE (r);
+  mem_free (r);
 }
 
 /* parse the type2.list as given by mixmaster -T */
@@ -209,7 +210,7 @@ static void mix_free_type2_list (REMAILER *** ttlp)
   for (i = 0; type2_list[i]; i++)
     mix_free_remailer (&type2_list[i]);
 
-  FREE (type2_list);
+  mem_free (type2_list);
 }
 
 
@@ -228,7 +229,7 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
   if (!chain->cl)
     return;
 
-  safe_realloc (coordsp, sizeof (struct coord) * chain->cl);
+  mem_realloc (coordsp, sizeof (struct coord) * chain->cl);
 
   coords = *coordsp;
 
@@ -490,7 +491,7 @@ void mix_make_chain (LIST ** chainp, int *redraw)
 
   *redraw = REDRAW_FULL;
 
-  chain = safe_calloc (sizeof (MIXCHAIN), 1);
+  chain = mem_calloc (sizeof (MIXCHAIN), 1);
   for (p = *chainp; p; p = p->next)
     mix_chain_add (chain, (char *) p->data, type2_list);
 
@@ -657,8 +658,8 @@ void mix_make_chain (LIST ** chainp, int *redraw)
   }
 
   mix_free_type2_list (&type2_list);
-  FREE (&coords);
-  FREE (&chain);
+  mem_free (&coords);
+  mem_free (&chain);
 }
 
 /* some safety checks before piping the message to mixmaster */