[03/10] don't call isdigit/tolower with a char argument

Commit Message

Ramsay Jones Aug. 4, 2014, 6:34 p.m. UTC

This suppresses some "array subscript has type 'char'" warnings from
gcc (version 4.8.3). (see also, commit cf5114a1)

Signed-off-by: Ramsay Jones <[e-mail]>
---
 expression.c | 2 +-
 lib.c        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/expression.c b/expression.c
index 4353dbe..7293d47 100644
--- a/expression.c
+++ b/expression.c
@@ -240,7 +240,7 @@  static struct token *builtin_offsetof_expr(struct token *token,
 
 static unsigned long long parse_num(const char *nptr, char **end)
 {
-	if (nptr[0] == '0' && tolower(nptr[1]) == 'b')
+	if (nptr[0] == '0' && tolower((unsigned char)nptr[1]) == 'b')
 		return strtoull(&nptr[2], end, 2);
 	return strtoull(nptr, end, 0);
 }
diff --git a/lib.c b/lib.c
index 4e6fc81..9c7767e 100644
--- a/lib.c
+++ b/lib.c
@@ -281,7 +281,7 @@  static char **handle_switch_D(char *arg, char **next)
 	const char *name = arg + 1;
 	const char *value = "1";
 
-	if (!*name || isspace(*name))
+	if (!*name || isspace((unsigned char)*name))
 		die("argument to `-D' is missing");
 
 	for (;;) {
@@ -699,7 +699,7 @@  static char **handle_param(char *arg, char **next)
 	/* For now just skip any '--param=*' or '--param *' */
 	if (*arg == '\0') {
 		value = *++next;
-	} else if (isspace(*arg) || *arg == '=') {
+	} else if (isspace((unsigned char)*arg) || *arg == '=') {
 		value = ++arg;
 	}