Changeset 557:2c8523f9a1c8 for color.c

Timestamp:

1998-11-10 14:14:00 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Introduce or rewrite mutt_{str*cmp,strlen} and use them all over the
place. If there are still segmentation faults due to missing
NONULLs over, they are gone now.

Files:

• color.c (modified) (8 diffs)

color.c

@@ -291 +291 @@
   char *eptr;
 
-  if (strncasecmp (s, "bright", 6) == 0)
+  if (mutt_strncasecmp (s, "bright", 6) == 0)
   {
     *attr |= brite;
@@ -298 +298 @@
 
   /* allow aliases for xterm color resources */
-  if (strncasecmp (s, "color", 5) == 0)
+  if (mutt_strncasecmp (s, "color", 5) == 0)
   {
     s += 5;
@@ -361 +361 @@
   }
 
-  if (strncmp (buf->data, "index", 5) != 0)
+  if (mutt_strncmp (buf->data, "index", 5) != 0)
   {
     snprintf (err->data, err->dsize,
@@ -392 +392 @@
   {
     mutt_extract_token (buf, s, 0);
-    if (!strcmp ("*", buf->data))
+    if (!mutt_strcmp ("*", buf->data))
     {
       for (tmp = ColorIndexList; tmp; )
@@ -408 +408 @@
       for (last = NULL, tmp = ColorIndexList; tmp; last = tmp, tmp = tmp->next)
       {
-        if (!strcmp (buf->data, tmp->pattern))
+        if (!mutt_strcmp (buf->data, tmp->pattern))
         {
           if (!do_cache)
@@ -455 +455 @@
     if (sensitive)
     {
-      if (strcmp (s, tmp->pattern) == 0)
+      if (mutt_strcmp (s, tmp->pattern) == 0)
         break;
     }
     else
     {
-      if (strcasecmp (s, tmp->pattern) == 0)
+      if (mutt_strcasecmp (s, tmp->pattern) == 0)
         break;
     }
@@ -541 +541 @@
   
   mutt_extract_token(buf, s, 0);
-  if(!strncmp(buf->data, "quoted", 6))
+  if(!mutt_strncmp(buf->data, "quoted", 6))
   {
     if(buf->data[6])
@@ -615 +615 @@
   mutt_extract_token (buf, s, 0);
 
-  if (strcasecmp ("bold", buf->data) == 0)
+  if (mutt_strcasecmp ("bold", buf->data) == 0)
     *attr |= A_BOLD;
-  else if (strcasecmp ("underline", buf->data) == 0)
+  else if (mutt_strcasecmp ("underline", buf->data) == 0)
     *attr |= A_UNDERLINE;
-  else if (strcasecmp ("none", buf->data) == 0)
+  else if (mutt_strcasecmp ("none", buf->data) == 0)
     *attr = A_NORMAL;
-  else if (strcasecmp ("reverse", buf->data) == 0)
+  else if (mutt_strcasecmp ("reverse", buf->data) == 0)
     *attr |= A_REVERSE;
-  else if (strcasecmp ("standout", buf->data) == 0)
+  else if (mutt_strcasecmp ("standout", buf->data) == 0)
     *attr |= A_STANDOUT;
-  else if (strcasecmp ("normal", buf->data) == 0)
+  else if (mutt_strcasecmp ("normal", buf->data) == 0)
     *attr = A_NORMAL; /* needs use = instead of |= to clear other bits */
   else