gmio_core: simplify implementation of toupper() and tolower() in string_utils.h

Also activate GMIO_STRINGUTILS_DIRECT_TESTS
This commit is contained in:
Hugues Delorme 2015-06-09 16:55:06 +02:00
parent 602b4c74d0
commit 02f083e02e

View File

@ -18,9 +18,9 @@
#include "../global.h" #include "../global.h"
#define GMIO_STRINGUTILS_C_ARRAYS /*#define GMIO_STRINGUTILS_C_ARRAYS*/
/*#define GMIO_STRINGUTILS_CTYPE_H*/ /*#define GMIO_STRINGUTILS_CTYPE_H*/
/*#define GMIO_STRINGUTILS_DIRECT_TESTS*/ #define GMIO_STRINGUTILS_DIRECT_TESTS
#ifdef GMIO_STRINGUTILS_CTYPE_H #ifdef GMIO_STRINGUTILS_CTYPE_H
# include <ctype.h> # include <ctype.h>
@ -127,17 +127,13 @@ GMIO_INLINE int gmio_clocale_islower(char c)
/*! Returns the lowercase letter converted to uppercase */ /*! Returns the lowercase letter converted to uppercase */
GMIO_INLINE char gmio_clocale_toupper(char c) GMIO_INLINE char gmio_clocale_toupper(char c)
{ {
if (gmio_clocale_islower(c)) return gmio_clocale_islower(c) ? c - 32 : c;
return c - 32;
return c;
} }
/*! Returns the uppercase letter converted to lowercase */ /*! Returns the uppercase letter converted to lowercase */
GMIO_INLINE char gmio_clocale_tolower(char c) GMIO_INLINE char gmio_clocale_tolower(char c)
{ {
if (gmio_clocale_isupper(c)) return gmio_clocale_isupper(c) ? c + 32 : c;
return c + 32;
return c;
} }
/*! Returns true if \p c1 compare equals to \p c2 /*! Returns true if \p c1 compare equals to \p c2