remove yet anoter round of str_* functions, replaced with their inlineable

[apps/madmutt.git] / color.c

diff --git a/color.c b/color.c
index d3b4be5..1e81ecb 100644 (file)
--- a/color.c
+++ b/color.c
@@ -298,13 +298,13 @@ parse_color_name (const char *s, int *col, int *attr, int brite, BUFFER * err)
 {
   char *eptr;
 
-  if (str_ncasecmp (s, "bright", 6) == 0) {
+  if (m_strncasecmp(s, "bright", 6) == 0) {
     *attr |= brite;
     s += 6;
   }
 
   /* allow aliases for xterm color resources */
-  if (str_ncasecmp (s, "color", 5) == 0) {
+  if (m_strncasecmp(s, "color", 5) == 0) {
     s += 5;
     *col = strtol (s, &eptr, 10);
     if (!*s || *eptr || *col < 0 ||
@@ -364,7 +364,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
     return (-1);
   }
 
-  if (str_ncmp (buf->data, "index", 5) != 0) {
+  if (m_strncmp(buf->data, "index", 5) != 0) {
     snprintf (err->data, err->dsize,
               _("%s: command valid only for index object"),
               parse_uncolor ? "uncolor" : "unmono");
@@ -461,7 +461,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
         break;
     }
     else {
-      if (str_casecmp (s, tmp->pattern) == 0)
+      if (m_strcasecmp(s, tmp->pattern) == 0)
         break;
     }
     tmp = tmp->next;
@@ -537,7 +537,7 @@ parse_object (BUFFER * buf, BUFFER * s, int *o, int *ql, BUFFER * err)
   }
 
   mutt_extract_token (buf, s, 0);
-  if (!str_ncmp (buf->data, "quoted", 6)) {
+  if (!m_strncmp(buf->data, "quoted", 6)) {
     if (buf->data[6]) {
       *ql = strtol (buf->data + 6, &eptr, 10);
       if (*eptr || q_level < 0) {