X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=color.c;h=3bee605fc720bfc1510e062169c2a48f6ebb3ab7;hp=ffc04db2fd57a1130ee314301732968f9c30a569;hb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/color.c b/color.c
index ffc04db..3bee605 100644
--- a/color.c
+++ b/color.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -19,8 +20,6 @@
 #include "mutt_curses.h"
 #include "mapping.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 
@@ -100,7 +99,7 @@ static struct mapping_t Fields[] = {
 
 static COLOR_LINE *mutt_new_color_line (void)
 {
-  COLOR_LINE *p = mem_calloc (1, sizeof (COLOR_LINE));
+  COLOR_LINE *p = p_new(COLOR_LINE, 1);
 
   p->fg = p->bg = -1;
 
@@ -702,7 +701,7 @@ _mutt_parse_color (BUFFER * buf, BUFFER * s, BUFFER * err,
   }
   else if (object == MT_COLOR_QUOTED) {
     if (q_level >= ColorQuoteSize) {
-      mem_realloc (&ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
+      p_realloc(&ColorQuote, ColorQuoteSize += 2);
       ColorQuote[ColorQuoteSize - 2] = ColorDefs[MT_COLOR_QUOTED];
       ColorQuote[ColorQuoteSize - 1] = ColorDefs[MT_COLOR_QUOTED];
     }