From 3bd7ec8782e9a6dd33fb78846f3cd514ffe8a9c2 Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougsys.fr>
Date: Thu, 28 May 2015 13:57:18 +0200
Subject: [PATCH] gmio_core: introduce ctype.h code alternative in
 string_utils.h

---
 src/gmio_core/internal/string_utils.h | 41 ++++++++++++++++++---------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/gmio_core/internal/string_utils.h b/src/gmio_core/internal/string_utils.h
index 38dcdbf..5b0eb65 100644
--- a/src/gmio_core/internal/string_utils.h
+++ b/src/gmio_core/internal/string_utils.h
@@ -18,19 +18,26 @@
 
 #include "../global.h"
 
+#define GMIO_STRINGUTILS_C_ARRAYS
+/*#define GMIO_STRINGUTILS_CTYPE_H*/
+/*#define GMIO_STRINGUTILS_DIRECT_TESTS*/
+
+#ifdef GMIO_STRINGUTILS_CTYPE_H
+#  include <ctype.h>
+#endif
+
 /*! Returns non-zero if \p c is a space (for C-locale), zero otherwise */
 GMIO_INLINE int gmio_clocale_isspace(char c)
 {
-#if 0
-    return c == 0x20      /* space (SPC) */
-            || c == 0x09  /* horizontal tab (TAB) */
-            || c == 0x0a  /* newline (LF) */
-            || c == 0x0b  /* vertical tab (VT) */
-            || c == 0x0c  /* feed (FF) */
-            || c == 0x0d  /* carriage return (CR) */
-            ;
-    /* return c == 0x20 || ((uint8_t)(c - 0x09) < 5); */
-#else
+#if defined(GMIO_STRINGUTILS_DIRECT_TESTS)
+    /* 0x20 : space (SPC)
+     * 0x09 : horizontal tab (TAB)
+     * 0x0a : newline (LF)
+     * 0x0b : vertical tab (VT)
+     * 0x0c : feed (FF)
+     * 0x0d : carriage return (CR) */
+    return c == 0x20 || ((uint8_t)(c - 0x09) < 5);
+#elif defined(GMIO_STRINGUTILS_C_ARRAYS)
     static const unsigned char space_chars[] = {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -50,6 +57,8 @@ GMIO_INLINE int gmio_clocale_isspace(char c)
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
     return space_chars[c];
+#elif defined(GMIO_STRINGUTILS_CTYPE_H)
+    return isspace(c);
 #endif
 }
 
@@ -57,9 +66,9 @@ GMIO_INLINE int gmio_clocale_isspace(char c)
  *  otherwise */
 GMIO_INLINE int gmio_clocale_isupper(char c)
 {
-#if 0
+#if defined(GMIO_STRINGUTILS_DIRECT_TESTS)
     return 65 <= c && c <= 90;
-#else
+#elif defined(GMIO_STRINGUTILS_C_ARRAYS)
     static const unsigned char upper_chars[] = {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -79,6 +88,8 @@ GMIO_INLINE int gmio_clocale_isupper(char c)
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
     return upper_chars[c];
+#elif defined(GMIO_STRINGUTILS_CTYPE_H)
+    return isupper(c);
 #endif
 }
 
@@ -86,9 +97,9 @@ GMIO_INLINE int gmio_clocale_isupper(char c)
  *  otherwise */
 GMIO_INLINE int gmio_clocale_islower(char c)
 {
-#if 0
+#if defined(GMIO_STRINGUTILS_DIRECT_TESTS)
     return 97 <= c && c <= 122;
-#else
+#elif defined(GMIO_STRINGUTILS_C_ARRAYS)
     static const unsigned char lower_chars[] = {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -108,6 +119,8 @@ GMIO_INLINE int gmio_clocale_islower(char c)
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
     return lower_chars[c];
+#elif defined(GMIO_STRINGUTILS_CTYPE_H)
+    return islower(c);
 #endif
 }