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.

1 files changed, 15 insertions, 9 deletions

diff --git a/nasmlib.h b/nasmlib.h
index 7391564c..51e787dd 100644
--- a/nasmlib.h
+++ b/nasmlib.h
@@ -19,6 +19,21 @@
 #endif
 
 /*
+ * tolower table -- avoids a function call on some platforms.
+ * NOTE: unlike the tolower() function in ctype, EOF is *NOT*
+ * a permitted value, for obvious reasons.
+ */
+void tolower_init(void);
+extern unsigned char nasm_tolower_tab[256];
+#define nasm_tolower(x) nasm_tolower_tab[(unsigned char)(x)]
+
+/* Wrappers around <ctype.h> functions */
+/* These are only valid for values that cannot include EOF */
+#define nasm_isspace(x) isspace((unsigned char)(x))
+#define nasm_isalnum(x) isalnum((unsigned char)(x))
+#define nasm_isdigit(x) isdigit((unsigned char)(x))
+
+/*
  * If this is defined, the wrappers around malloc et al will
  * transform into logging variants, which will cause NASM to create
  * a file called `malloc.log' when run, and spew details of all its
@@ -176,15 +191,6 @@ void standard_extension(char *inname, char *outname, char *extension,
 #define elements(x)     ( sizeof(x) / sizeof(*(x)) )
 
 /*
- * tolower table -- avoids a function call on some platforms.
- * NOTE: unlike the tolower() function in ctype, EOF is *NOT*
- * a permitted value, for obvious reasons.
- */
-void tolower_init(void);
-extern unsigned char nasm_tolower_tab[256];
-#define nasm_tolower(x) nasm_tolower_tab[(unsigned char)(x)]
-
-/*
  * some handy macros that will probably be of use in more than one
  * output format: convert integers into little-endian byte packed
  * format in memory