Use ascii_str* instead of mutt_str* in several places where it's needed.

diff --git a/color.c b/color.c
index cbe2029ad09b58f8252716964af02f7429a9ccc8..d1917be8d08346e29f09f0a52bd02cdf530786c4 100644 (file)
--- a/color.c
+++ b/color.c
@@ -309,14 +309,14 @@ parse_color_name (const char *s, int *col, int *attr, int brite, BUFFER *err)
 {
   char *eptr;
 
-  if (mutt_strncasecmp (s, "bright", 6) == 0)
+  if (ascii_strncasecmp (s, "bright", 6) == 0)
   {
     *attr |= brite;
     s += 6;
   }
 
   /* allow aliases for xterm color resources */
-  if (mutt_strncasecmp (s, "color", 5) == 0)
+  if (ascii_strncasecmp (s, "color", 5) == 0)
   {
     s += 5;
     *col = strtol (s, &eptr, 10);

diff --git a/crypt.c b/crypt.c
index 0f08f2a6f23a900f318d4ca751337538ff634281..e3ef2d3e6461912b0438345ffccfaefa5c32d508 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -552,7 +552,7 @@ void convert_to_7bit (BODY *a)
        convert_to_7bit (a->parts);
     } 
     else if (a->type == TYPEMESSAGE &&
-            mutt_strcasecmp(a->subtype, "delivery-status"))
+            ascii_strcasecmp(a->subtype, "delivery-status"))
     {
       if(a->encoding != ENC7BIT)
        mutt_message_to_7bit (a, NULL);
@@ -808,15 +808,15 @@ int mutt_signed_handler (BODY *a, STATE *s)
   
   if ((WithCrypto & APPLICATION_PGP)
       && protocol_major == TYPEAPPLICATION
-      && !mutt_strcasecmp (protocol_minor, "pgp-signature"))
+      && !ascii_strcasecmp (protocol_minor, "pgp-signature"))
     ;
   else if ((WithCrypto & APPLICATION_SMIME)
            && protocol_major == TYPEAPPLICATION
-          && !(mutt_strcasecmp (protocol_minor, "x-pkcs7-signature")
-              && mutt_strcasecmp (protocol_minor, "pkcs7-signature")))
+          && !(ascii_strcasecmp (protocol_minor, "x-pkcs7-signature")
+              && ascii_strcasecmp (protocol_minor, "pkcs7-signature")))
     ;
   else if (protocol_major == TYPEMULTIPART
-          && !mutt_strcasecmp (protocol_minor, "mixed"))
+          && !ascii_strcasecmp (protocol_minor, "mixed"))
     ;
   else
   {
@@ -840,7 +840,7 @@ int mutt_signed_handler (BODY *a, STATE *s)
        {
          if ((WithCrypto & APPLICATION_PGP)
               && signatures[i]->type == TYPEAPPLICATION 
-             && !mutt_strcasecmp (signatures[i]->subtype, "pgp-signature"))
+             && !ascii_strcasecmp (signatures[i]->subtype, "pgp-signature"))
          {
            if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
              goodsig = 0;
@@ -850,8 +850,8 @@ int mutt_signed_handler (BODY *a, STATE *s)
 
          if ((WithCrypto & APPLICATION_SMIME)
               && signatures[i]->type == TYPEAPPLICATION 
-             && (!mutt_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
-                 || !mutt_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
+             && (!ascii_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
+                 || !ascii_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
          {
            if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
              goodsig = 0;

diff --git a/handler.c b/handler.c
index 898caf709d1d67d36fa123666507eed271aa5303..51266904a4fa9f90973c4315ed3e9310b7acfe8b 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -1843,7 +1843,7 @@ int mutt_body_handler (BODY *b, STATE *s)
        handler = mutt_signed_handler;
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && mutt_strcasecmp ("encrypted", b->subtype) == 0)
+             && ascii_strcasecmp ("encrypted", b->subtype) == 0)
     {
       p = mutt_get_parameter ("protocol", b->parameter);
 

diff --git a/init.c b/init.c
index a5bc63caf07019a2bf79e00fe368e200a3c1c717..88f443ae4324e468e6f0894b45028edbbca2cef9 100644 (file)
--- a/init.c
+++ b/init.c
@@ -834,9 +834,9 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err)
     a = safe_malloc(sizeof(ATTACH_MATCH));
 
     /* some cheap hacks that I expect to remove */
-    if (!mutt_strcasecmp(buf->data, "any"))
+    if (!ascii_strcasecmp(buf->data, "any"))
       a->major = safe_strdup("*/.*");
-    else if (!mutt_strcasecmp(buf->data, "none"))
+    else if (!ascii_strcasecmp(buf->data, "none"))
       a->major = safe_strdup("cheap_hack/this_should_never_match");
     else
       a->major = safe_strdup(buf->data);
@@ -898,9 +898,9 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
   {
     mutt_extract_token (buf, s, 0);
 
-    if (!mutt_strcasecmp(buf->data, "any"))
+    if (!ascii_strcasecmp(buf->data, "any"))
       tmp = safe_strdup("*/.*");
-    else if (!mutt_strcasecmp(buf->data, "none"))
+    else if (!ascii_strcasecmp(buf->data, "none"))
       tmp = safe_strdup("cheap_hack/this_should_never_match");
     else
       tmp = safe_strdup(buf->data);
@@ -1001,13 +1001,13 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER
     op = '+';
     category--;
   }
-  if (!mutt_strncasecmp(category, "attachment", strlen(category))) {
+  if (!ascii_strncasecmp(category, "attachment", strlen(category))) {
     if (op == '+')
       listp = &AttachAllow;
     else
       listp = &AttachExclude;
   }
-  else if (!mutt_strncasecmp(category, "inline", strlen(category))) {
+  else if (!ascii_strncasecmp(category, "inline", strlen(category))) {
     if (op == '+')
       listp = &InlineAllow;
     else
@@ -1038,13 +1038,13 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFF
     op = '+';
     p--;
   }
-  if (!mutt_strncasecmp(p, "attachment", strlen(p))) {
+  if (!ascii_strncasecmp(p, "attachment", strlen(p))) {
     if (op == '+')
       listp = &AttachAllow;
     else
       listp = &AttachExclude;
   }
-  else if (!mutt_strncasecmp(p, "inline", strlen(p))) {
+  else if (!ascii_strncasecmp(p, "inline", strlen(p))) {
     if (op == '+')
       listp = &InlineAllow;
     else

diff --git a/parse.c b/parse.c
index 7c637a9f68c15445681bba76087c6d23c89fcd3c..d87f556b61cc3cac4e76747b035aefcc1f6add60 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -1542,7 +1542,7 @@ int count_body_parts (BODY *body, int flags)
     {
       /* Always recurse multiparts, except multipart/alternative. */
       shallrecurse = 1;
-      if (!mutt_strcasecmp(bp->subtype, "alternative"))
+      if (!ascii_strcasecmp(bp->subtype, "alternative"))
         shallrecurse = 0;
 
       /* Don't count containers if they're top-level. */

diff --git a/smime.c b/smime.c
index 12c0151db20870b2d825d0a5c4648504351ead2d..b31b997f2393ad7b037deaa150632fc685a5ddaf 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -1621,7 +1621,7 @@ int smime_verify_one (BODY *sigbdy, STATE *s, const char *tempfile)
       rewind (smimeerr);
       
       line = mutt_read_line (line, &linelen, smimeerr, &lineno);
-      if (linelen && !mutt_strcasecmp (line, "verification successful"))
+      if (linelen && !ascii_strcasecmp (line, "verification successful"))
        badsig = 0;
 
       FREE (&line);
@@ -1842,7 +1842,7 @@ static BODY *smime_handle_entity (BODY *m, STATE *s, FILE *outFile)
     rewind (smimeerr);
     
     line = mutt_read_line (line, &linelen, smimeerr, &lineno);
-    if (linelen && !mutt_strcasecmp (line, "verification successful"))
+    if (linelen && !ascii_strcasecmp (line, "verification successful"))
       m->goodsig = 1;
     FREE (&line);
   }