Removed the non-LOCALE character code and the #ifdefs and simplified.

[mmh] / sbr / uprf.c

diff --git a/sbr/uprf.c b/sbr/uprf.c
index 836a98b..77137c9 100644 (file)
--- a/sbr/uprf.c
+++ b/sbr/uprf.c
@@ -8,9 +8,6 @@
 
 #include <h/mh.h>
 
-#define TO_LOWER 040
-#define NO_MASK  000
-
 
 int
 uprf(char *c1, char *c2)
@@ -21,16 +18,7 @@ uprf(char *c1, char *c2)
                return 0;
 
        while ((c = *c2++)) {
-#ifdef LOCALE
-               c &= 0xff;
-               mask = *c1 & 0xff;
-               c = (isalpha(c) && isupper(c)) ? tolower(c) : c;
-               mask = (isalpha(mask) && isupper(mask)) ? tolower(mask) : mask;
-               if (c != mask)
-#else
-               mask = (isalpha(c) && isalpha(*c1)) ?  TO_LOWER : NO_MASK;
-               if ((c | mask) != (*c1 | mask))
-#endif
+               if (tolower(c &= 0xff) != tolower(*c1 & 0xff))
                        return 0;
                else
                        c1++;