From 3c5ccf16e7dc0eef903c3c49958559cb4a3a370b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 19 Oct 2019 12:44:21 +0200 Subject: 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. --- src/n3.c | 3 +-- src/string_utils.h | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/n3.c b/src/n3.c index 129a7c44..4fe0363c 100644 --- a/src/n3.c +++ b/src/n3.c @@ -25,7 +25,6 @@ #include "serd/serd.h" #include -#include #include #include #include @@ -703,7 +702,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 3f3d8c12..362dfcc1 100644 --- a/src/string_utils.h +++ b/src/string_utils.h @@ -20,7 +20,6 @@ #include "serd/serd.h" #include -#include #include #include #include @@ -74,6 +73,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) { @@ -90,11 +96,17 @@ is_windows_path(const char* path) size_t serd_substrlen(const char* str, size_t len, SerdNodeFlags* flags); +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); } } -- cgit v1.2.1