Remove most ascii_ functions

Issue: #325

diff --git a/ascii.c b/ascii.c
index 45f7e5d09410071c270ea151417b5e4cd6f322f2..abc8f6c6cc268663a633958fb6becd72956ac022 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -34,32 +34,6 @@
 #include <stdlib.h>
 #include "ascii.h"
 
-inline int ascii_isupper (int c)
-{
-  return (c >= 'A') && (c <= 'Z');
-}
-
-inline int ascii_islower (int c)
-{
-  return (c >= 'a') && (c <= 'z');
-}
-
-inline int ascii_toupper (int c)
-{
-  if (ascii_islower (c))
-    return c & ~32;
-  
-  return c;
-}
-
-inline int ascii_tolower (int c)
-{
-  if (ascii_isupper (c))
-    return c | 32;
-  
-  return c;
-}
-
 int ascii_strcasecmp (const char *a, const char *b)
 {
   int i;
@@ -73,7 +47,7 @@ int ascii_strcasecmp (const char *a, const char *b)
   
   for (;; a++, b++)
   {
-    if ((i = ascii_tolower (*a) - ascii_tolower (*b)))
+    if ((i = tolower (*a) - tolower (*b)))
       return i;
     /* test for NUL here rather that in the for loop in order to detect unqual
      * length strings (see http://dev.mutt.org/trac/ticket/3601)
@@ -98,7 +72,7 @@ int ascii_strncasecmp (const char *a, const char *b, int n)
   
   for (j = 0; (*a || *b) && j < n; a++, b++, j++)
   {
-    if ((i = ascii_tolower (*a) - ascii_tolower (*b)))
+    if ((i = tolower (*a) - tolower (*b)))
       return i;
   }
   

diff --git a/ascii.h b/ascii.h
index a4aad7484005ac97c26f1adc758bdf01d4553191..35ee2b60f9ede69e4cc72b089246bbfeef626fc7 100644 (file)
--- a/ascii.h
+++ b/ascii.h
@@ -29,10 +29,8 @@
 #ifndef _ASCII_H
 # define _ASCII_H
 
-int ascii_isupper (int c);
-int ascii_islower (int c);
-int ascii_toupper (int c);
-int ascii_tolower (int c);
+#include <ctype.h>
+
 int ascii_strcasecmp (const char *a, const char *b);
 int ascii_strncasecmp (const char *a, const char *b, int n);
 
@@ -43,10 +41,9 @@ static inline char* ascii_strlower (char *s)
 {
   char *p = s;
 
-  while (*p)
+  for (; *p; ++p)
   {
-    *p = ascii_tolower ((unsigned int) *p);
-    p++;
+    *p = tolower (*p);
   }
 
   return s;

diff --git a/charset.c b/charset.c
index 2411f2cb4a91112bfb3f7801e6c8978674dc42e5..2f2e9bfe2997ad926a09a7cf8b34e5298e4282fa 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -281,7 +281,7 @@ void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
 
   /* for cosmetics' sake, transform to lowercase. */
   for (p = dest; *p; p++)
-    *p = ascii_tolower (*p);
+    *p = tolower (*p);
 
 out:
   if (ext && *ext)

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 1c543a58d16a00f4d020b623af5eb2cde86e2842..c783cbb91e56aaf321d0fcc01451fa10067513ab 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -2774,7 +2774,7 @@ static const char *crypt_entry_fmt (char *dest,
   kflags = (key->flags /*| (pkey->flags & KEYFLAG_RESTRICTIONS)
                          | uid->flags*/);
   
-  switch (ascii_tolower (op))
+  switch (tolower (op))
     {
     case '[':
       {

diff --git a/edit.c b/edit.c
index 823a0165d5489a5f2fe695ee886ac1c3607722ff..df6ae460f9096720ec25c6f8933b8997818e589e 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -384,8 +384,8 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
                                                                cur->msgno + 1);
            }
            buf = be_include_messages (p, buf, &bufmax, &buflen,
-                                      (ascii_tolower (tmp[1]) == 'm'),
-                                      (ascii_isupper ((unsigned char) tmp[1])));
+                                      (tolower (tmp[1]) == 'm'),
+                                      (isupper ((unsigned char) tmp[1])));
          }
          else
            addstr (_("No mailbox.\n"));

diff --git a/keymap.c b/keymap.c
index 8daa970e65420de7945502f084efe1c63a78b1ba..1cc26e8f3d860ac57386c7c418544db95320989c 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -144,7 +144,7 @@ static int parse_fkey(char *s)
   char *t;
   int n = 0;
 
-  if(s[0] != '<' || ascii_tolower(s[1]) != 'f')
+  if(s[0] != '<' || tolower(s[1]) != 'f')
     return -1;
 
   for(t = s + 2; *t && isdigit((unsigned char) *t); t++)

diff --git a/nntp.c b/nntp.c
index 85d27b49c4db120ce49480e8f3d8cbeb0ab116c8..7461b2e1ed276800cb6f6384e5074e2f18a7b10b 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -338,7 +338,7 @@ static int nntp_auth (NNTP_SERVER *nserv)
     p = authenticators;
     while (*p)
     {
-      *p = ascii_toupper (*p);
+      *p = toupper (*p);
       p++;
     }
 

diff --git a/parse.c b/parse.c
index 2947c9a3420e4998137a55d827252773e515b63f..b9d0356f8afc86801de6421a9b490903c7c1b20f 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -986,7 +986,7 @@ int mutt_parse_rfc822_line (ENVELOPE *e, HEADER *hdr, char *line, char *p, short
   if (lastp)
     last = *lastp;
   
-  switch (ascii_tolower (line[0]))
+  switch (tolower (line[0]))
   {
     case 'a':
     if (ascii_strcasecmp (line+1, "pparently-to") == 0)

diff --git a/pgpkey.c b/pgpkey.c
index 36a92ae2c738bb28b65df7f9ccf3f62150f99035..21d991cecfd210b24383f76de1c7fb9da3c8c480 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -149,7 +149,7 @@ static const char *pgp_entry_fmt (char *dest,
   kflags = key->flags | (pkey->flags & KEYFLAG_RESTRICTIONS)
     | uid->flags;
 
-  switch (ascii_tolower (op))
+  switch (tolower (op))
   {
     case '[':
 

diff --git a/url.c b/url.c
index eff1b1e6786923e0d97b1e54ad18b573aa8f43d2..2e2ee10d683b19879f6e196a441e04f526cb8828 100644 (file)
--- a/url.c
+++ b/url.c
@@ -92,7 +92,7 @@ url_scheme_t url_check_scheme (const char *s)
 
   strfcpy (sbuf, s, t - s + 1);
   for (t = sbuf; *t; t++)
-    *t = ascii_tolower (*t);
+    *t = tolower (*t);
 
   if ((i = mutt_getvaluebyname (sbuf, UrlMap)) == -1)
     return U_UNKNOWN;