X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=dd7ef8e2f7fe9e58662835717160f32a69a3425f;hp=e71d85b731564ee68f5462b63bd20a467bb3eb5e;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/recvattach.c b/recvattach.c
index e71d85b..dd7ef8e 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -13,6 +13,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -29,9 +31,6 @@
 #include "copy.h"
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -107,7 +106,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
         str_replace (&idx[x]->tree, buf);
     }
     else
-      idx[x]->tree = str_dup (buf);
+      idx[x]->tree = m_strdup(buf);
 
     if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) {
       s = buf + 2 * (idx[x]->level - 1);
@@ -128,7 +127,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
 
   for (; m; m = m->next) {
     if (*idxlen == *idxmax) {
-      mem_realloc (&idx, sizeof (ATTACHPTR *) * ((*idxmax) += 5));
+      p_realloc(&idx, (*idxmax) += 5);
       for (i = *idxlen; i < *idxmax; i++)
         idx[i] = NULL;
     }