Don't need to cast to `char *' for free(3) these days.

[nmh] / sbr / uprf.c

diff --git a/sbr/uprf.c b/sbr/uprf.c
index b3c81ff0ed46391e65af5ba97e8a0536c79fbe02..179955a3a3cd85dda8569e235b93e240d816ec14 100644 (file)
--- a/sbr/uprf.c
+++ b/sbr/uprf.c
@@ -9,12 +9,9 @@
 
 #include <h/mh.h>
 
 
 #include <h/mh.h>
 

-#define TO_LOWER 040
-#define NO_MASK  000
-

 
 int
 
 int

-uprf (char *c1, char *c2)
+uprf (const char *c1, const char *c2)

 {
     int c, mask;
 
 {
     int c, mask;
 


@@ -23,19 +20,13 @@ uprf (char *c1, char *c2)
 
     while ((c = *c2++))
     {
 
     while ((c = *c2++))
     {

-#ifdef LOCALE

        c &= 0xff;
        mask = *c1 & 0xff;
        c &= 0xff;
        mask = *c1 & 0xff;

-       c = (isalpha(c) && isupper(c)) ? tolower(c) : c;
-       mask = (isalpha(mask) && isupper(mask)) ? tolower(mask) : mask;
+       c = tolower(c);
+       mask = tolower(mask);

        if (c != mask)
        if (c != mask)

-#else
-       mask = (isalpha(c) && isalpha(*c1)) ?  TO_LOWER : NO_MASK;
-       if ((c | mask) != (*c1 | mask))
-#endif

            return 0;
            return 0;

-       else
-           c1++;
+        c1++;

     }
     return 1;
 }
     }
     return 1;
 }