X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=bb48e07ad38395a1b8e02b0c23493fc9c275e2b1;hp=fd1cea5da26760dbf507c0c0de64a6130e6d5175;hb=1dc7032b59cc5b91d70076ed228bda8caf65a7f3;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/muttlib.c b/muttlib.c
index fd1cea5..bb48e07 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -34,8 +35,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 
@@ -55,7 +54,7 @@
 
 BODY *mutt_new_body (void)
 {
-  BODY *p = (BODY *) mem_calloc (1, sizeof (BODY));
+  BODY *p = p_new(BODY, 1);
 
   p->disposition = DISPATTACH;
   p->use_disp = 1;
@@ -1335,7 +1334,7 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x)
   for (; l; l = l->next) {
     /* If this pattern needs more matches, expand pmatch. */
     if (l->nmatch > nmatch) {
-      mem_realloc (&pmatch, l->nmatch * sizeof (regmatch_t));
+      p_realloc(&pmatch, l->nmatch);
       nmatch = l->nmatch;
     }