cJSON

mirror of Dave's cJSON
git clone git://git.thc420.xyz/cJSON
Log | Files | Refs | README | LICENSE

commit 466eb8e3f8a65080f2b3ca4a79ab7b72bd539dba
parent 4ec6e76ea2eec16f54b58e8c95b4c734e59481e4
Author: Max Bruckner <max@maxbruckner.de>
Date:   Sat, 18 Mar 2017 17:52:04 +0100

Fix wconversion with old gcc (e.g. 4.3)

Diffstat:
McJSON.c | 8++++----
McJSON_Utils.c | 4++--
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cJSON.c b/cJSON.c @@ -1226,7 +1226,7 @@ static cJSON_bool print_array(const cJSON * const item, const size_t depth, cons update_offset(output_buffer); if (current_element->next) { - length = format ? 2 : 1; + length = (size_t) (format ? 2 : 1); output_pointer = ensure(output_buffer, length + 1, hooks); if (output_pointer == NULL) { @@ -1362,7 +1362,7 @@ static cJSON_bool print_object(const cJSON * const item, const size_t depth, con } /* Compose the output: */ - length = format ? 2 : 1; /* fmt: {\n */ + length = (size_t) (format ? 2 : 1); /* fmt: {\n */ output_pointer = ensure(output_buffer, length + 1, hooks); if (output_pointer == NULL) { @@ -1400,7 +1400,7 @@ static cJSON_bool print_object(const cJSON * const item, const size_t depth, con } update_offset(output_buffer); - length = format ? 2 : 1; + length = (size_t) (format ? 2 : 1); output_pointer = ensure(output_buffer, length, hooks); if (output_pointer == NULL) { @@ -1421,7 +1421,7 @@ static cJSON_bool print_object(const cJSON * const item, const size_t depth, con update_offset(output_buffer); /* print comma if not last */ - length = (size_t) (format ? 1 : 0) + (current_item->next ? 1 : 0); + length = (size_t) ((format ? 1 : 0) + (current_item->next ? 1 : 0)); output_pointer = ensure(output_buffer, length + 1, hooks); if (output_pointer == NULL) { diff --git a/cJSON_Utils.c b/cJSON_Utils.c @@ -230,11 +230,11 @@ static void cJSONUtils_InplaceDecodePointerString(unsigned char *string) for (; *string; (void)s2++, string++) { - *s2 = (*string != '~') + *s2 = (unsigned char) ((*string != '~') ? (*string) : ((*(++string) == '0') ? '~' - : '/'); + : '/')); } *s2 = '\0';