Changeset 4490:9855b4b114ba

Timestamp:

2005-12-16 10:49:40 (3 years ago)

Author:

Recai Oktas <roktas@…>

Branch:

HEAD

Message:

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

Files:

• color.c (modified) (2 diffs)
• crypt.c (modified) (4 diffs)
• handler.c (modified) (1 diff)
• init.c (modified) (6 diffs)
• parse.c (modified) (1 diff)
• smime.c (modified) (2 diffs)

color.c

@@ -310 +310 @@
   char *eptr;
 
-  if (mutt_strncasecmp (s, "bright", 6) == 0)
+  if (ascii_strncasecmp (s, "bright", 6) == 0)
   {
     *attr |= brite;
@@ -317 +317 @@
 
   /* allow aliases for xterm color resources */
-  if (mutt_strncasecmp (s, "color", 5) == 0)
+  if (ascii_strncasecmp (s, "color", 5) == 0)
   {
     s += 5;

crypt.c

@@ -553 +553 @@
     } 
     else if (a->type == TYPEMESSAGE &&
-             mutt_strcasecmp(a->subtype, "delivery-status"))
+             ascii_strcasecmp(a->subtype, "delivery-status"))
     {
       if(a->encoding != ENC7BIT)
@@ -809 +809 @@
   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
@@ -841 +841 @@
           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)
@@ -851 +851 @@
           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)

handler.c

@@ -1844 +1844 @@
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && mutt_strcasecmp ("encrypted", b->subtype) == 0)
+             && ascii_strcasecmp ("encrypted", b->subtype) == 0)
     {
       p = mutt_get_parameter ("protocol", b->parameter);

init.c

@@ -835 +835 @@
 
     /* 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
@@ -899 +899 @@
     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
@@ -1002 +1002 @@
     category--;
   }
-  if (!mutt_strncasecmp(category, "attachment", strlen(category))) {
+  if (!ascii_strncasecmp(category, "attachment", strlen(category))) {
     if (op == '+')
       listp = &AttachAllow;
@@ -1008 +1008 @@
       listp = &AttachExclude;
   }
-  else if (!mutt_strncasecmp(category, "inline", strlen(category))) {
+  else if (!ascii_strncasecmp(category, "inline", strlen(category))) {
     if (op == '+')
       listp = &InlineAllow;
@@ -1039 +1039 @@
     p--;
   }
-  if (!mutt_strncasecmp(p, "attachment", strlen(p))) {
+  if (!ascii_strncasecmp(p, "attachment", strlen(p))) {
     if (op == '+')
       listp = &AttachAllow;
@@ -1045 +1045 @@
       listp = &AttachExclude;
   }
-  else if (!mutt_strncasecmp(p, "inline", strlen(p))) {
+  else if (!ascii_strncasecmp(p, "inline", strlen(p))) {
     if (op == '+')
       listp = &InlineAllow;

parse.c

@@ -1543 +1543 @@
       /* Always recurse multiparts, except multipart/alternative. */
       shallrecurse = 1;
-      if (!mutt_strcasecmp(bp->subtype, "alternative"))
+      if (!ascii_strcasecmp(bp->subtype, "alternative"))
         shallrecurse = 0;
 

smime.c

@@ -1622 +1622 @@
       
       line = mutt_read_line (line, &linelen, smimeerr, &lineno);
-      if (linelen && !mutt_strcasecmp (line, "verification successful"))
+      if (linelen && !ascii_strcasecmp (line, "verification successful"))
         badsig = 0;
 
@@ -1843 +1843 @@
     
     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);