X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=265a18c40d3f5611ee7cabd8d52641adbcf7013a;hp=69614edf35f3e41ccab61819a61a1cddf6cdc0b0;hb=cf69ddd650f124d3aed242285434ba2b97fb4b79;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/recvattach.c b/recvattach.c
index 69614ed..265a18c 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -56,7 +56,7 @@ static struct mapping_t AttachHelp[] = {
 
 int mutt_extract_path (char *filename, char *path)
 {
-  char *tmp = safe_malloc (sizeof (char) * _POSIX_PATH_MAX);
+  char *tmp = mem_malloc (sizeof (char) * _POSIX_PATH_MAX);
   char *help_ptr;
 
   help_ptr = tmp;
@@ -70,7 +70,7 @@ int mutt_extract_path (char *filename, char *path)
     }
     *help_ptr++ = *filename++;
   }
-  FREE (&tmp);
+  mem_free (&tmp);
   return 0;
 }
 
@@ -120,7 +120,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
 
   for (; m; m = m->next) {
     if (*idxlen == *idxmax) {
-      safe_realloc (&idx, sizeof (ATTACHPTR *) * ((*idxmax) += 5));
+      mem_realloc (&idx, sizeof (ATTACHPTR *) * ((*idxmax) += 5));
       for (i = *idxlen; i < *idxmax; i++)
         idx[i] = NULL;
     }
@@ -138,7 +138,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
     }
     else {
       if (!idx[*idxlen])
-        idx[*idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR));
+        idx[*idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
 
       new = idx[(*idxlen)++];
       new->content = m;
@@ -527,7 +527,7 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
       break;
   }
 
-  FREE (&directory);
+  mem_free (&directory);
 
   if (tag && menu) {
     menu->oldcurrent = menu->current;
@@ -1218,12 +1218,12 @@ void mutt_view_attachments (HEADER * hdr)
           hdr->attach_del = 1;
         if (idx[idxmax]->content)
           idx[idxmax]->content->aptr = NULL;
-        FREE (&idx[idxmax]->tree);
-        FREE (&idx[idxmax]);
+        mem_free (&idx[idxmax]->tree);
+        mem_free (&idx[idxmax]);
       }
       if (hdr->attach_del)
         hdr->changed = 1;
-      FREE (&idx);
+      mem_free (&idx);
       idxmax = 0;
 
       if (WithCrypto && need_secured && secured) {