ctype.h: wrapper ctype functions with a cast to (unsigned char)

ctype functions take an *int*, which the user is expected to have
taken the input character from getc() and friends, or taken a
character and cast it to (unsigned char).

We don't care about EOF (-1), so use macros that cast to (unsigned
char) for us.

8 files changed, 64 insertions, 64 deletions

diff --git a/output/outaout.c b/output/outaout.c
index f374b9e..48a2cff 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -279,9 +279,9 @@ static void aout_deflabel(char *name, int32_t segment, int64_t offset,
                 expr *e;
                 char *p = special;
 
-                while (*p && !isspace(*p))
+                while (*p && !nasm_isspace(*p))
                     p++;
-                while (*p && isspace(*p))
+                while (*p && nasm_isspace(*p))
                     p++;
                 stdscan_reset();
                 stdscan_bufptr = p;
@@ -370,7 +370,7 @@ static void aout_deflabel(char *name, int32_t segment, int64_t offset,
                     error(ERR_NONFATAL, "Linux a.out does not support"
                           " symbol size information");
                 } else {
-                    while (special[n] && isspace(special[n]))
+                    while (special[n] && nasm_isspace(special[n]))
                         n++;
                     /*
                      * We have a size expression; attempt to
diff --git a/output/outbin.c b/output/outbin.c
index e71a60e..b494a97 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -881,7 +881,7 @@ static int bin_read_attribute(char **line, int *attribute,
     char *exp;
 
     /* Skip whitespace. */
-    while (**line && isspace(**line))
+    while (**line && nasm_isspace(**line))
         (*line)++;
     if (!**line)
         return 0;
@@ -909,12 +909,12 @@ static int bin_read_attribute(char **line, int *attribute,
             *line += 9;
             return 1;
         } else if (!nasm_strnicmp(*line, "nobits", 6) &&
-                   (isspace((*line)[6]) || ((*line)[6] == '\0'))) {
+                   (nasm_isspace((*line)[6]) || ((*line)[6] == '\0'))) {
             *attribute = ATTRIB_NOBITS;
             *line += 6;
             return 1;
         } else if (!nasm_strnicmp(*line, "progbits", 8) &&
-                   (isspace((*line)[8]) || ((*line)[8] == '\0'))) {
+                   (nasm_isspace((*line)[8]) || ((*line)[8] == '\0'))) {
             *attribute = ATTRIB_PROGBITS;
             *line += 8;
             return 1;
@@ -927,7 +927,7 @@ static int bin_read_attribute(char **line, int *attribute,
     if ((*line)[attrib_name_size] != '(') {
         /* Single term (no parenthesis). */
         exp = *line += attrib_name_size;
-        while (**line && !isspace(**line))
+        while (**line && !nasm_isspace(**line))
             (*line)++;
         if (**line) {
             **line = '\0';
@@ -1017,7 +1017,7 @@ static void bin_assign_attributes(struct Section *sec, char *astring)
                 break;          /* End of line. */
             else {
                 p = astring;
-                while (*astring && !isspace(*astring))
+                while (*astring && !nasm_isspace(*astring))
                     astring++;
                 if (*astring) {
                     *astring = '\0';
@@ -1245,7 +1245,7 @@ static int32_t bin_secname(char *name, int pass, int *bits)
     /* Attempt to find the requested section.  If it does not
      * exist, create it. */
     p = name;
-    while (*p && !isspace(*p))
+    while (*p && !nasm_isspace(*p))
         p++;
     if (*p)
         *p++ = '\0';
diff --git a/output/outcoff.c b/output/outcoff.c
index d8d1d3d..d539900 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -274,7 +274,7 @@ static int32_t coff_section_names(char *name, int pass, int *bits)
         return def_seg;
 
     p = name;
-    while (*p && !isspace(*p))
+    while (*p && !nasm_isspace(*p))
         p++;
     if (*p)
         *p++ = '\0';
@@ -285,15 +285,15 @@ static int32_t coff_section_names(char *name, int pass, int *bits)
     }
     flags = 0;
 
-    while (*p && isspace(*p))
+    while (*p && nasm_isspace(*p))
         p++;
     while (*p) {
         char *q = p;
-        while (*p && !isspace(*p))
+        while (*p && !nasm_isspace(*p))
             p++;
         if (*p)
             *p++ = '\0';
-        while (*p && isspace(*p))
+        while (*p && nasm_isspace(*p))
             p++;
 
         if (!nasm_stricmp(q, "code") || !nasm_stricmp(q, "text")) {
@@ -696,11 +696,11 @@ static int coff_directives(char *directive, char *value, int pass)
         if (pass == 2)
             return 1;           /* ignore in pass two */
         name = q = value;
-        while (*q && !isspace(*q))
+        while (*q && !nasm_isspace(*q))
             q++;
-        if (isspace(*q)) {
+        if (nasm_isspace(*q)) {
             *q++ = '\0';
-            while (*q && isspace(*q))
+            while (*q && nasm_isspace(*q))
                 q++;
         }
 
diff --git a/output/outelf32.c b/output/outelf32.c
index f97a53c..bff264a 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -420,21 +420,21 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
     }
 
     p = name;
-    while (*p && !isspace(*p))
+    while (*p && !nasm_isspace(*p))
         p++;
     if (*p)
         *p++ = '\0';
     flags_and = flags_or = type = align = 0;
 
-    while (*p && isspace(*p))
+    while (*p && nasm_isspace(*p))
         p++;
     while (*p) {
         char *q = p;
-        while (*p && !isspace(*p))
+        while (*p && !nasm_isspace(*p))
             p++;
         if (*p)
             *p++ = '\0';
-        while (*p && isspace(*p))
+        while (*p && nasm_isspace(*p))
             p++;
 
         if (!nasm_strnicmp(q, "align=", 6)) {
@@ -550,9 +550,9 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
                 expr *e;
                 char *p = special;
 
-                while (*p && !isspace(*p))
+                while (*p && !nasm_isspace(*p))
                     p++;
-                while (*p && isspace(*p))
+                while (*p && nasm_isspace(*p))
                     p++;
                 stdscan_reset();
                 stdscan_bufptr = p;
@@ -669,7 +669,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
                           n, special);
                 special += n;
 
-                while (isspace(*special))
+                while (nasm_isspace(*special))
                     ++special;
                 if (*special) {
                     n = strcspn(special, " \t");
@@ -692,7 +692,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
                     int fwd = 0;
                     char *saveme = stdscan_bufptr;      /* bugfix? fbk 8/10/00 */
 
-                    while (special[n] && isspace(special[n]))
+                    while (special[n] && nasm_isspace(special[n]))
                         n++;
                     /*
                      * We have a size expression; attempt to
diff --git a/output/outelf64.c b/output/outelf64.c
index 3980cda..f483393 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -432,21 +432,21 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
     }
 
     p = name;
-    while (*p && !isspace(*p))
+    while (*p && !nasm_isspace(*p))
         p++;
     if (*p)
         *p++ = '\0';
     flags_and = flags_or = type = align = 0;
 
-    while (*p && isspace(*p))
+    while (*p && nasm_isspace(*p))
         p++;
     while (*p) {
         char *q = p;
-        while (*p && !isspace(*p))
+        while (*p && !nasm_isspace(*p))
             p++;
         if (*p)
             *p++ = '\0';
-        while (*p && isspace(*p))
+        while (*p && nasm_isspace(*p))
             p++;
 
         if (!nasm_strnicmp(q, "align=", 6)) {
@@ -562,9 +562,9 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
                 expr *e;
                 char *p = special;
 
-                while (*p && !isspace(*p))
+                while (*p && !nasm_isspace(*p))
                     p++;
-                while (*p && isspace(*p))
+                while (*p && nasm_isspace(*p))
                     p++;
                 stdscan_reset();
                 stdscan_bufptr = p;
@@ -681,7 +681,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
                           n, special);
                 special += n;
 
-                while (isspace(*special))
+                while (nasm_isspace(*special))
                     ++special;
                 if (*special) {
                     n = strcspn(special, " \t");
@@ -704,7 +704,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
 		    int fwd = 0;
                     char *saveme = stdscan_bufptr;      /* bugfix? fbk 8/10/00 */
 
-                    while (special[n] && isspace(special[n]))
+                    while (special[n] && nasm_isspace(special[n]))
                         n++;
                     /*
                      * We have a size expression; attempt to
diff --git a/output/outieee.c b/output/outieee.c
index c14064c..b70d3b2 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -678,19 +678,19 @@ static int32_t ieee_segment(char *name, int pass, int *bits)
         while (*name == '.')
             name++;             /* hack, but a documented one */
         p = name;
-        while (*p && !isspace(*p))
+        while (*p && !nasm_isspace(*p))
             p++;
         if (*p) {
             *p++ = '\0';
-            while (*p && isspace(*p))
+            while (*p && nasm_isspace(*p))
                 *p++ = '\0';
         }
         while (*p) {
-            while (*p && !isspace(*p))
+            while (*p && !nasm_isspace(*p))
                 p++;
             if (*p) {
                 *p++ = '\0';
-                while (*p && isspace(*p))
+                while (*p && nasm_isspace(*p))
                     *p++ = '\0';
             }
 
diff --git a/output/outobj.c b/output/outobj.c
index 74eb38e..9ca368d 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -1288,19 +1288,19 @@ static int32_t obj_segment(char *name, int pass, int *bits)
         while (*name == '.')
             name++;             /* hack, but a documented one */
         p = name;
-        while (*p && !isspace(*p))
+        while (*p && !nasm_isspace(*p))
             p++;
         if (*p) {
             *p++ = '\0';
-            while (*p && isspace(*p))
+            while (*p && nasm_isspace(*p))
                 *p++ = '\0';
         }
         while (*p) {
-            while (*p && !isspace(*p))
+            while (*p && !nasm_isspace(*p))
                 p++;
             if (*p) {
                 *p++ = '\0';
-                while (*p && isspace(*p))
+                while (*p && nasm_isspace(*p))
                     *p++ = '\0';
             }
 
@@ -1522,11 +1522,11 @@ static int obj_directive(char *directive, char *value, int pass)
             while (*q == '.')
                 q++;            /* hack, but a documented one */
             v = q;
-            while (*q && !isspace(*q))
+            while (*q && !nasm_isspace(*q))
                 q++;
-            if (isspace(*q)) {
+            if (nasm_isspace(*q)) {
                 *q++ = '\0';
-                while (*q && isspace(*q))
+                while (*q && nasm_isspace(*q))
                     q++;
             }
             /*
@@ -1565,11 +1565,11 @@ static int obj_directive(char *directive, char *value, int pass)
 
             while (*q) {
                 p = q;
-                while (*q && !isspace(*q))
+                while (*q && !nasm_isspace(*q))
                     q++;
-                if (isspace(*q)) {
+                if (nasm_isspace(*q)) {
                     *q++ = '\0';
-                    while (*q && isspace(*q))
+                    while (*q && nasm_isspace(*q))
                         q++;
                 }
                 /*
@@ -1630,20 +1630,20 @@ static int obj_directive(char *directive, char *value, int pass)
         if (pass == 2)
             return 1;           /* ignore in pass two */
         extname = q = value;
-        while (*q && !isspace(*q))
+        while (*q && !nasm_isspace(*q))
             q++;
-        if (isspace(*q)) {
+        if (nasm_isspace(*q)) {
             *q++ = '\0';
-            while (*q && isspace(*q))
+            while (*q && nasm_isspace(*q))
                 q++;
         }
 
         libname = q;
-        while (*q && !isspace(*q))
+        while (*q && !nasm_isspace(*q))
             q++;
-        if (isspace(*q)) {
+        if (nasm_isspace(*q)) {
             *q++ = '\0';
-            while (*q && isspace(*q))
+            while (*q && nasm_isspace(*q))
                 q++;
         }
 
@@ -1679,20 +1679,20 @@ static int obj_directive(char *directive, char *value, int pass)
         if (pass == 2)
             return 1;           /* ignore in pass two */
         intname = q = value;
-        while (*q && !isspace(*q))
+        while (*q && !nasm_isspace(*q))
             q++;
-        if (isspace(*q)) {
+        if (nasm_isspace(*q)) {
             *q++ = '\0';
-            while (*q && isspace(*q))
+            while (*q && nasm_isspace(*q))
                 q++;
         }
 
         extname = q;
-        while (*q && !isspace(*q))
+        while (*q && !nasm_isspace(*q))
             q++;
-        if (isspace(*q)) {
+        if (nasm_isspace(*q)) {
             *q++ = '\0';
-            while (*q && isspace(*q))
+            while (*q && nasm_isspace(*q))
                 q++;
         }
 
@@ -1706,11 +1706,11 @@ static int obj_directive(char *directive, char *value, int pass)
         }
         while (*q) {
             v = q;
-            while (*q && !isspace(*q))
+            while (*q && !nasm_isspace(*q))
                 q++;
-            if (isspace(*q)) {
+            if (nasm_isspace(*q)) {
                 *q++ = '\0';
-                while (*q && isspace(*q))
+                while (*q && nasm_isspace(*q))
                     q++;
             }
             if (!nasm_stricmp(v, "resident"))
diff --git a/output/outrdf2.c b/output/outrdf2.c
index b00ad43..b502715 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -155,11 +155,11 @@ static int32_t rdf2_section_names(char *name, int pass, int *bits)
 
     /* look for segment type code following segment name */
     p = name;
-    while (*p && !isspace(*p))
+    while (*p && !nasm_isspace(*p))
         p++;
     if (*p) {                   /* we're now in whitespace */
         *p++ = '\0';
-        while (*p && isspace(80))
+        while (*p && nasm_isspace(80))
             *p++ = '\0';
     }
     if (*p) {                   /* we're now in an attribute value */
@@ -418,7 +418,7 @@ static void rdf2_deflabel(char *name, int32_t segment, int64_t offset,
         }
 
         if (*special) {
-            while (isspace(*special))
+            while (nasm_isspace(*special))
                 special++;
             if (!nasm_stricmp(special, "far")) {
                 farsym = 1;