From 655c26ada1726fec7cc0fee74aa475daed2e6ec5 Mon Sep 17 00:00:00 2001 From: Max Bruckner Date: Sat, 25 Mar 2017 14:06:45 +0100 Subject: [PATCH] cJSON_strcasecmp: Improve readability --- cJSON.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/cJSON.c b/cJSON.c index 77b148b..30ef378 100644 --- a/cJSON.c +++ b/cJSON.c @@ -65,25 +65,33 @@ CJSON_PUBLIC(const char*) cJSON_Version(void) } /* case insensitive strcmp */ -static int cJSON_strcasecmp(const unsigned char *s1, const unsigned char *s2) +static int cJSON_strcasecmp(const unsigned char *string1, const unsigned char *string2) { - if (!s1) + if (string1 == NULL) { - return (s1 == s2) ? 0 : 1; /* both NULL? */ + if (string2 == NULL) + { + /* both NULL */ + return 0; + } + + return 1; } - if (!s2) + + if (string2 == NULL) { return 1; } - for(; tolower(*s1) == tolower(*s2); (void)++s1, ++s2) + + for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++) { - if (*s1 == '\0') + if (*string1 == '\0') { return 0; } } - return tolower(*s1) - tolower(*s2); + return tolower(string1[0]) - tolower(string2[0]); } typedef struct internal_hooks