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

[mmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index ac98883..2c16dfe 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -57,32 +57,17 @@ match(char *str, char *sub)
        int c1, c2;
        char *s1, *s2;
 
-#ifdef LOCALE
        while ((c1 = *sub)) {
-               c1 = (isalpha(c1) && isupper(c1)) ? tolower(c1) : c1;
-               while ((c2 = *str++) && c1 != ((isalpha(c2) && isupper(c2)) ? tolower(c2) : c2))
+               while ((c2 = *str++) && tolower(c1) != tolower(c2))
                        ;
                if (! c2)
                        return 0;
                s1 = sub + 1; s2 = str;
-               while ((c1 = *s1++) && ((isalpha(c1) && isupper(c1)) ? tolower(c1) : c1) == ((isalpha(c2 =*s2++) && isupper(c2)) ? tolower(c2) : c2))
+               while ((c1 = *s1++) && tolower(c1) == tolower(*s2++))
                        ;
                if (! c1)
                        return 1;
        }
-#else
-       while ((c1 = *sub)) {
-               while ((c2 = *str++) && (c1 | 040) != (c2 | 040))
-                       ;
-               if (! c2)
-                       return 0;
-               s1 = sub + 1; s2 = str;
-               while ((c1 = *s1++) && (c1 | 040) == (*s2++ | 040))
-                       ;
-               if (! c1)
-                       return 1;
-       }
-#endif
        return 1;
 }
 
@@ -217,12 +202,7 @@ cpstripped(char **start, char *end, char *str)
                return;
 
        /* skip any initial control characters or spaces */
-       while ((c = (unsigned char) *s) &&
-#ifdef LOCALE
-                       (iscntrl(c) || isspace(c)))
-#else
-                       (c <= 32))
-#endif
+       while ((c = (unsigned char) *s) && (iscntrl(c) || isspace(c)))
                s++;
 
        /* compact repeated control characters and spaces into a single space */
@@ -231,11 +211,7 @@ cpstripped(char **start, char *end, char *str)
                        *(*start)++ = c;
                else {
                        while ((c = (unsigned char) *s) &&
-#ifdef LOCALE
-                               (iscntrl(c) || isspace(c)))
-#else
-                               (c <= 32))
-#endif
+                                       (iscntrl(c) || isspace(c)))
                                s++;
                        *(*start)++ = ' ';
                }
@@ -622,12 +598,12 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
                        if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))
                                set_dotw(tws);
                        switch (fmt->f_comp->c_tws->tw_flags & TW_SDAY) {
-                               case TW_SEXP:
-                                       value = 1; break;
-                               case TW_SIMP:
-                                       value = 0; break;
-                               default:
-                                       value = -1; break;
+                       case TW_SEXP:
+                               value = 1; break;
+                       case TW_SIMP:
+                               value = 0; break;
+                       default:
+                               value = -1; break;
                        }
                case FT_LV_ZONEF:
                        if ((fmt->f_comp->c_tws->tw_flags & TW_SZONE) == TW_SZEXP)
@@ -740,18 +716,18 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 
                                while ( str[n] != '\0') {
                                        switch ( str[n] ) {
-                                               case '\\':
-                                                       n++;
-                                                       if ( str[n] != '\0')
-                                                               buffer2[m++] = str[n++];
-                                                       break;
-                                               case '"':
-                                                       n++;
-                                                       break;
-                                               default:
+                                       case '\\':
+                                               n++;
+                                               if ( str[n] != '\0')
                                                        buffer2[m++] = str[n++];
-                                                       break;
-                                               }
+                                               break;
+                                       case '"':
+                                               n++;
+                                               break;
+                                       default:
+                                               buffer2[m++] = str[n++];
+                                               break;
+                                       }
                                }
                                buffer2[m] = '\0';
                                str = buffer2;