Old patch I had lying around: correctly cast the argument to is*().

IWBNI gcc could warn about this the way it warns about printf() abuse.

MFC after:	1 week

3 files changed, 25 insertions, 24 deletions

diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index b98fa56..900b685 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -369,7 +369,7 @@ fetchParseURL(const char *URL)
 	/* port */
 	if (*p == ':') {
 		for (q = ++p; *q && (*q != '/'); q++)
-			if (isdigit(*q))
+			if (isdigit((int)*q))
 				u->port = u->port * 10 + (*q - '0');
 			else {
 				/* invalid port */
@@ -395,7 +395,7 @@ nohost:
 		}
 		u->doc = doc;
 		while (*p != '\0') {
-			if (!isspace(*p)) {
+			if (!isspace((int)*p)) {
 				*doc++ = *p++;
 			} else {
 				*doc++ = '%';
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index 5e4f7c3..bac5c72 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -102,11 +102,11 @@ __FBSDID("$FreeBSD$");
 static struct url cached_host;
 static conn_t	*cached_connection;
 
-#define isftpreply(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
-			 && isdigit(foo[2]) \
+#define isftpreply(foo) (isdigit((int)foo[0]) && isdigit((int)foo[1]) \
+			 && isdigit((int)foo[2]) \
 			 && (foo[3] == ' ' || foo[3] == '\0'))
-#define isftpinfo(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
-			&& isdigit(foo[2]) && foo[3] == '-')
+#define isftpinfo(foo) (isdigit((int)foo[0]) && isdigit((int)foo[1]) \
+			&& isdigit((int)foo[2]) && foo[3] == '-')
 
 /*
  * Translate IPv4 mapped IPv6 address to IPv4 address
@@ -150,7 +150,7 @@ ftp_chkerr(conn_t *conn)
 		}
 	}
 
-	while (conn->buflen && isspace(conn->buf[conn->buflen - 1]))
+	while (conn->buflen && isspace((int)conn->buf[conn->buflen - 1]))
 		conn->buflen--;
 	conn->buf[conn->buflen] = '\0';
 
@@ -414,11 +414,11 @@ ftp_stat(conn_t *conn, const char *file, struct url_stat *us)
 		ftp_seterr(e);
 		return (-1);
 	}
-	for (ln = conn->buf + 4; *ln && isspace(*ln); ln++)
+	for (ln = conn->buf + 4; *ln && isspace((int)*ln); ln++)
 		/* nothing */ ;
-	for (us->size = 0; *ln && isdigit(*ln); ln++)
+	for (us->size = 0; *ln && isdigit((int)*ln); ln++)
 		us->size = us->size * 10 + *ln - '0';
-	if (*ln && !isspace(*ln)) {
+	if (*ln && !isspace((int)*ln)) {
 		ftp_seterr(FTP_PROTOCOL_ERROR);
 		us->size = -1;
 		return (-1);
@@ -432,7 +432,7 @@ ftp_stat(conn_t *conn, const char *file, struct url_stat *us)
 		ftp_seterr(e);
 		return (-1);
 	}
-	for (ln = conn->buf + 4; *ln && isspace(*ln); ln++)
+	for (ln = conn->buf + 4; *ln && isspace((int)*ln); ln++)
 		/* nothing */ ;
 	switch (strspn(ln, "0123456789")) {
 	case 14:
@@ -691,7 +691,7 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file,
 		switch (e) {
 		case FTP_PASSIVE_MODE:
 		case FTP_LPASSIVE_MODE:
-			for (p = ln + 3; *p && !isdigit(*p); p++)
+			for (p = ln + 3; *p && !isdigit((int)*p); p++)
 				/* nothing */ ;
 			if (!*p) {
 				e = FTP_PROTOCOL_ERROR;
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index 1feaf4a..909b91c 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -137,15 +137,15 @@ http_new_chunk(struct httpio *io)
 	if (fetch_getln(io->conn) == -1)
 		return (-1);
 
-	if (io->conn->buflen < 2 || !ishexnumber(*io->conn->buf))
+	if (io->conn->buflen < 2 || !isxdigit((int)*io->conn->buf))
 		return (-1);
 
-	for (p = io->conn->buf; *p && !isspace(*p); ++p) {
+	for (p = io->conn->buf; *p && !isspace((int)*p); ++p) {
 		if (*p == ';')
 			break;
-		if (!ishexnumber(*p))
+		if (!isxdigit((int)*p))
 			return (-1);
-		if (isdigit(*p)) {
+		if (isdigit((int)*p)) {
 			io->chunksize = io->chunksize * 16 +
 			    *p - '0';
 		} else {
@@ -417,7 +417,8 @@ http_get_reply(conn_t *conn)
 			return (HTTP_PROTOCOL_ERROR);
 		p += 4;
 	}
-	if (*p != ' ' || !isdigit(p[1]) || !isdigit(p[2]) || !isdigit(p[3]))
+	if (*p != ' ' || !isdigit((int)p[1]) ||
+	    !isdigit((int)p[2]) || !isdigit((int)p[3]))
 		return (HTTP_PROTOCOL_ERROR);
 
 	conn->err = (p[1] - '0') * 100 + (p[2] - '0') * 10 + (p[3] - '0');
@@ -435,7 +436,7 @@ http_match(const char *str, const char *hdr)
 		/* nothing */;
 	if (*str || *hdr != ':')
 		return (NULL);
-	while (*hdr && isspace(*++hdr))
+	while (*hdr && isspace((int)*++hdr))
 		/* nothing */;
 	return (hdr);
 }
@@ -450,7 +451,7 @@ http_next_header(conn_t *conn, const char **p)
 
 	if (fetch_getln(conn) == -1)
 		return (hdr_syserror);
-	while (conn->buflen && isspace(conn->buf[conn->buflen - 1]))
+	while (conn->buflen && isspace((int)conn->buf[conn->buflen - 1]))
 		conn->buflen--;
 	conn->buf[conn->buflen] = '\0';
 	if (conn->buflen == 0)
@@ -499,7 +500,7 @@ http_parse_length(const char *p, off_t *length)
 {
 	off_t len;
 
-	for (len = 0; *p && isdigit(*p); ++p)
+	for (len = 0; *p && isdigit((int)*p); ++p)
 		len = len * 10 + (*p - '0');
 	if (*p)
 		return (-1);
@@ -524,16 +525,16 @@ http_parse_range(const char *p, off_t *offset, off_t *length, off_t *size)
 		first = last = -1;
 		++p;
 	} else {
-		for (first = 0; *p && isdigit(*p); ++p)
+		for (first = 0; *p && isdigit((int)*p); ++p)
 			first = first * 10 + *p - '0';
 		if (*p != '-')
 			return (-1);
-		for (last = 0, ++p; *p && isdigit(*p); ++p)
+		for (last = 0, ++p; *p && isdigit((int)*p); ++p)
 			last = last * 10 + *p - '0';
 	}
 	if (first > last || *p != '/')
 		return (-1);
-	for (len = 0, ++p; *p && isdigit(*p); ++p)
+	for (len = 0, ++p; *p && isdigit((int)*p); ++p)
 		len = len * 10 + *p - '0';
 	if (*p || len < last - first + 1)
 		return (-1);
@@ -747,7 +748,7 @@ http_print_html(FILE *out, FILE *in)
 
 	comment = tag = 0;
 	while ((line = fgetln(in, &len)) != NULL) {
-		while (len && isspace(line[len - 1]))
+		while (len && isspace((int)line[len - 1]))
 			--len;
 		for (p = q = line; q < line + len; ++q) {
 			if (comment && *q == '-') {