From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 26 Sep 2011 22:56:56 +0000 (-0400)
Subject: fix ctype macros to cast argument to (unsigned) first
X-Git-Tag: v0.8.4~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7e14ed1360c65b78c3ad1fc4fafea13e30067478;p=oweals%2Fmusl.git

fix ctype macros to cast argument to (unsigned) first

issue reported by nsz, but it's actually not just pedantic. the
functions can take input of any arithmetic type, including floating
point, and the behavior needs to be as if the conversion implicit in
the function call took place.
---

diff --git a/include/ctype.h b/include/ctype.h
index 97b9737c..a605d089 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -16,12 +16,12 @@ int   isxdigit(int);
 int   tolower(int);
 int   toupper(int);
 
-#define isalpha(a) ((unsigned)(((a)|32)-'a') < 26)
-#define isdigit(a) ((unsigned)((a)-'0') < 10)
-#define islower(a) ((unsigned)((a)-'a') < 26)
-#define isupper(a) ((unsigned)((a)-'A') < 26)
-#define isprint(a) ((unsigned)((a)-0x20) < 0x5f)
-#define isgraph(a) ((unsigned)((a)-0x21) < 0x5e)
+#define isalpha(a) ((((unsigned)(a)|32)-'a') < 26)
+#define isdigit(a) (((unsigned)(a)-'0') < 10)
+#define islower(a) (((unsigned)(a)-'a') < 26)
+#define isupper(a) (((unsigned)(a)-'A') < 26)
+#define isprint(a) (((unsigned)(a)-0x20) < 0x5f)
+#define isgraph(a) (((unsigned)(a)-0x21) < 0x5e)
 
 
 
diff --git a/include/wctype.h b/include/wctype.h
index af9be069..3a5af6e7 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -36,7 +36,7 @@ wctrans_t wctrans(const char *);
 wctype_t  wctype(const char *);
 
 #undef iswdigit
-#define iswdigit(a) ((unsigned)((a)-L'0') < 10)
+#define iswdigit(a) (((unsigned)(a)-L'0') < 10)
 
 #ifdef __cplusplus
 }