Avoid use of ctype.h macros entirely

Some of these cause warnings, and should never have been used in the first
place since they depend on locale.

2 files changed, 15 insertions, 4 deletions

diff --git a/src/n3.c b/src/n3.c
index aa68bf9a..72e77a1e 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -25,7 +25,6 @@
 #include "serd/serd.h"
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -675,7 +674,7 @@ read_IRIREF(SerdReader* reader, SerdNode** dest)
 			break;
 		default:
 			if (c <= 0x20) {
-				if (isprint(c)) {
+				if (is_print(c)) {
 					r_err(reader, SERD_ERR_BAD_SYNTAX,
 					      "invalid IRI character `%c' (escape %%%02X)\n",
 					      c, (unsigned)c);
diff --git a/src/string_utils.h b/src/string_utils.h
index 7663736d..6595ca2f 100644
--- a/src/string_utils.h
+++ b/src/string_utils.h
@@ -20,7 +20,6 @@
 #include "serd/serd.h"
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -76,6 +75,13 @@ is_space(const int c)
 }
 
 static inline bool
+is_print(const int c)
+{
+	return c >= 0x20 && c <= 0x7E;
+}
+
+/** Return true iff `c` is a valid encoded base64 character. */
+static inline bool
 is_base64(const int c)
 {
 	return is_alpha(c) || is_digit(c) || c == '+' || c == '/' || c == '=';
@@ -116,11 +122,17 @@ serd_substrlen(const char* const    str,
 	return i;
 }
 
+static inline char
+serd_to_upper(const char c)
+{
+	return (char)((c >= 'a' && c <= 'z') ? c - 32 : c);
+}
+
 static inline int
 serd_strncasecmp(const char* s1, const char* s2, size_t n)
 {
 	for (; n > 0 && *s2; s1++, s2++, --n) {
-		if (toupper(*s1) != toupper(*s2)) {
+		if (serd_to_upper(*s1) != serd_to_upper(*s2)) {
 			return ((*(const uint8_t*)s1 < *(const uint8_t*)s2) ? -1 : +1);
 		}
 	}