X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=color.c;h=8980b0b69436bb1fc01221714b41eeedd50e5419;hp=f024078aa0b6f042eecd515760b92f8c7ac35871;hb=ba5e3af4ea19e1d20c80941c077039871ec84258;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/color.c b/color.c
index f024078..8980b0b 100644
--- a/color.c
+++ b/color.c
@@ -15,6 +15,11 @@
 #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>
 #include <stdlib.h>
 #include <ctype.h>
@@ -91,7 +96,7 @@ static struct mapping_t Fields[] = {
 
 static COLOR_LINE *mutt_new_color_line (void)
 {
-  COLOR_LINE *p = safe_calloc (1, sizeof (COLOR_LINE));
+  COLOR_LINE *p = mem_calloc (1, sizeof (COLOR_LINE));
 
   p->fg = p->bg = -1;
 
@@ -118,14 +123,14 @@ static void mutt_free_color_line (COLOR_LINE ** l, int free_colors)
 
   regfree (&tmp->rx);
   mutt_pattern_free (&tmp->color_pattern);
-  FREE (&tmp->pattern);
-  FREE (l);
+  mem_free (&tmp->pattern);
+  mem_free (l);
 }
 
 void ci_start_color (void)
 {
   memset (ColorDefs, A_NORMAL, sizeof (int) * MT_COLOR_MAX);
-  ColorQuote = (int *) safe_malloc (COLOR_QUOTE_INIT * sizeof (int));
+  ColorQuote = (int *) mem_malloc (COLOR_QUOTE_INIT * sizeof (int));
   memset (ColorQuote, A_NORMAL, sizeof (int) * COLOR_QUOTE_INIT);
   ColorQuoteSize = COLOR_QUOTE_INIT;
   ColorQuoteUsed = 0;
@@ -218,7 +223,7 @@ int mutt_alloc_color (int fg, int bg)
     i++;
   }
 
-  p = (COLOR_LIST *) safe_malloc (sizeof (COLOR_LIST));
+  p = (COLOR_LIST *) mem_malloc (sizeof (COLOR_LIST));
   p->next = ColorList;
   ColorList = p;
 
@@ -241,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));
 }
@@ -259,20 +263,18 @@ 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;
-        FREE (&p);
+        mem_free (&p);
         return;
       }
       q = ColorList;
       while (q) {
         if (q->next == p) {
           q->next = p->next;
-          FREE (&p);
+          mem_free (&p);
           return;
         }
         q = q->next;
@@ -293,13 +295,13 @@ parse_color_name (const char *s, int *col, int *attr, int brite, BUFFER * err)
 {
   char *eptr;
 
-  if (mutt_strncasecmp (s, "bright", 6) == 0) {
+  if (str_ncasecmp (s, "bright", 6) == 0) {
     *attr |= brite;
     s += 6;
   }
 
   /* allow aliases for xterm color resources */
-  if (mutt_strncasecmp (s, "color", 5) == 0) {
+  if (str_ncasecmp (s, "color", 5) == 0) {
     s += 5;
     *col = strtol (s, &eptr, 10);
     if (!*s || *eptr || *col < 0 ||
@@ -359,7 +361,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
     return (-1);
   }
 
-  if (mutt_strncmp (buf->data, "index", 5) != 0) {
+  if (str_ncmp (buf->data, "index", 5) != 0) {
     snprintf (err->data, err->dsize,
               _("%s: command valid only for index object"),
               parse_uncolor ? "uncolor" : "unmono");
@@ -397,7 +399,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
 
   do {
     mutt_extract_token (buf, s, 0);
-    if (!mutt_strcmp ("*", buf->data)) {
+    if (!str_cmp ("*", buf->data)) {
       for (tmp = ColorIndexList; tmp;) {
         if (!do_cache)
           do_cache = 1;
@@ -410,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 (!mutt_strcmp (buf->data, tmp->pattern)) {
+        if (!str_cmp (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
@@ -454,11 +454,11 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
 
   while (tmp) {
     if (sensitive) {
-      if (mutt_strcmp (s, tmp->pattern) == 0)
+      if (str_cmp (s, tmp->pattern) == 0)
         break;
     }
     else {
-      if (mutt_strcasecmp (s, tmp->pattern) == 0)
+      if (str_casecmp (s, tmp->pattern) == 0)
         break;
     }
     tmp = tmp->next;
@@ -507,7 +507,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
       return (-1);
     }
     tmp->next = *top;
-    tmp->pattern = safe_strdup (s);
+    tmp->pattern = str_dup (s);
 #ifdef HAVE_COLOR
     if (fg != -1 && bg != -1) {
       tmp->fg = fg;
@@ -534,7 +534,7 @@ parse_object (BUFFER * buf, BUFFER * s, int *o, int *ql, BUFFER * err)
   }
 
   mutt_extract_token (buf, s, 0);
-  if (!mutt_strncmp (buf->data, "quoted", 6)) {
+  if (!str_ncmp (buf->data, "quoted", 6)) {
     if (buf->data[6]) {
       *ql = strtol (buf->data + 6, &eptr, 10);
       if (*eptr || q_level < 0) {
@@ -698,7 +698,7 @@ _mutt_parse_color (BUFFER * buf, BUFFER * s, BUFFER * err,
   }
   else if (object == MT_COLOR_QUOTED) {
     if (q_level >= ColorQuoteSize) {
-      safe_realloc (&ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
+      mem_realloc (&ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
       ColorQuote[ColorQuoteSize - 2] = ColorDefs[MT_COLOR_QUOTED];
       ColorQuote[ColorQuoteSize - 1] = ColorDefs[MT_COLOR_QUOTED];
     }