X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=color.c;h=6266e67e728f130b5fbe6e8dcc1cdf4aced02ed4;hp=69e444ea3ac291d53bdfd70bb672f88f8dda8b83;hb=8376ae73a59f4a6075ab91bf99fe97b394a58d79;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/color.c b/color.c
index 69e444e..6266e67 100644
--- a/color.c
+++ b/color.c
@@ -18,6 +18,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -245,8 +246,7 @@ int mutt_alloc_color (int fg, int bg)
 
   init_pair (i, fg, bg);
 
-  dprint (1, (debugfile, "mutt_alloc_color(): Color pairs used so far: %d\n",
-              UserColors));
+  debug_print (1, ("Color pairs used so far: %d\n", UserColors));
 
   return (COLOR_PAIR (p->index));
 }
@@ -263,9 +263,7 @@ void mutt_free_color (int fg, int bg)
         return;
 
       UserColors--;
-      dprint (1,
-              (debugfile, "mutt_free_color(): Color pairs used so far: %d\n",
-               UserColors));
+      debug_print (1, ("Color pairs used so far: %d\n", UserColors));
 
       if (p == ColorList) {
         ColorList = ColorList->next;
@@ -401,7 +399,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
 
   do {
     mutt_extract_token (buf, s, 0);
-    if (!safe_strcmp ("*", buf->data)) {
+    if (!mutt_strcmp ("*", buf->data)) {
       for (tmp = ColorIndexList; tmp;) {
         if (!do_cache)
           do_cache = 1;
@@ -414,12 +412,10 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
     else {
       for (last = NULL, tmp = ColorIndexList; tmp;
            last = tmp, tmp = tmp->next) {
-        if (!safe_strcmp (buf->data, tmp->pattern)) {
+        if (!mutt_strcmp (buf->data, tmp->pattern)) {
           if (!do_cache)
             do_cache = 1;
-          dprint (1,
-                  (debugfile, "Freeing pattern \"%s\" from ColorIndexList\n",
-                   tmp->pattern));
+          debug_print (1, ("Freeing pattern \"%s\" from ColorIndexList\n", tmp->pattern));
           if (last)
             last->next = tmp->next;
           else
@@ -458,7 +454,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
 
   while (tmp) {
     if (sensitive) {
-      if (safe_strcmp (s, tmp->pattern) == 0)
+      if (mutt_strcmp (s, tmp->pattern) == 0)
         break;
     }
     else {