X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ba8b265a8211b2052b424dc9bd7ea391a8ded87a..3ab1e9323e964d5377952a2b666ce91bab39c45a:/sbr/fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index b0beeb23..a47c170e 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -49,24 +49,14 @@ match (char *str, char *sub)
     char *s1, *s2;
 
     while ((c1 = *sub)) {
-	c1 = (isascii((unsigned char) c1) && isalpha((unsigned char) c1) &&
-	      isupper((unsigned char) c1)) ? tolower((unsigned char) c1) : c1;
-	while ((c2 = *str++) && c1 != ((isascii((unsigned char) c2) &&
-					isalpha((unsigned char) c2) &&
-					isupper((unsigned char) c2)) ?
-					    tolower((unsigned char) c2) : c2))
+	c1 = tolower((unsigned char)c1);
+	while ((c2 = *str++) && c1 != tolower((unsigned char)c2))
 	    ;
 	if (! c2)
 	    return 0;
 	s1 = sub + 1; s2 = str;
-	while ((c1 = *s1++) && ((isascii((unsigned char) c1) &&
-				 isalpha((unsigned char) c1) &&
-				 isupper((unsigned char) c1)) ?
-				 	tolower(c1) : c1) ==
-			((isascii((unsigned char) (c2 =*s2++)) &&
-			  isalpha((unsigned char) c2) &&
-			  isupper((unsigned char) c2)) ?
-			  	tolower((unsigned char) c2) : c2))
+	while ((c1 = *s1++) &&
+            tolower((unsigned char)c1) == tolower((unsigned char)(c2 = *s2++)))
 	    ;
 	if (! c1)
 	    return 1;
@@ -1185,5 +1175,5 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	}
     }
 
-    return ((struct format *)0);
+    return (NULL);
 }