Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / lib-ui / color.c

diff --git a/lib-ui/color.c b/lib-ui/color.c
index 20fb8b0..a9ee64a 100644 (file)
--- a/lib-ui/color.c
+++ b/lib-ui/color.c
@@ -7,27 +7,13 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include "curses.h"
 
+#include "pattern.h"
 #include "mutt.h"
 
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 /* globals */
 int *ColorQuote;
 int ColorQuoteUsed;
@@ -126,7 +112,7 @@ static void mutt_free_color_line (COLOR_LINE ** l, int free_colors)
    */
 
   regfree (&tmp->rx);
-  mutt_pattern_free (&tmp->color_pattern);
+  pattern_list_wipe(&tmp->color_pattern);
   p_delete(&tmp->pattern);
   p_delete(l);
 }
@@ -250,8 +236,6 @@ int mutt_alloc_color (int fg, int bg)
 
   init_pair (i, fg, bg);
 
-  debug_print (1, ("Color pairs used so far: %d\n", UserColors));
-
   return (COLOR_PAIR (p->index));
 }
 
@@ -267,7 +251,6 @@ void mutt_free_color (int fg, int bg)
         return;
 
       UserColors--;
-      debug_print (1, ("Color pairs used so far: %d\n", UserColors));
 
       if (p == ColorList) {
         ColorList = ColorList->next;
@@ -419,7 +402,6 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
         if (!m_strcmp(buf->data, tmp->pattern)) {
           if (!do_cache)
             do_cache = 1;
-          debug_print (1, ("Freeing pattern \"%s\" from ColorIndexList\n", tmp->pattern));
           if (last)
             last->next = tmp->next;
           else