X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=color.c;h=81adfbb584a159c427df50428856572fe419a3a2;hp=854dde5e0312389a94c3317d1f13b6790e5fe890;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/color.c b/color.c
index 854dde5..81adfbb 100644
--- a/color.c
+++ b/color.c
@@ -12,6 +12,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -19,9 +21,6 @@
 #include "mutt_curses.h"
 #include "mapping.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -511,7 +510,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
       return (-1);
     }
     tmp->next = *top;
-    tmp->pattern = str_dup (s);
+    tmp->pattern = m_strdup(s);
 #ifdef HAVE_COLOR
     if (fg != -1 && bg != -1) {
       tmp->fg = fg;
@@ -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];
     }