mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Max Bruckner 2017-03-18 17:52:04 +01:00
parent 4ec6e76ea2
commit 466eb8e3f8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cJSON.c
View File

@ -1226,7 +1226,7 @@ static cJSON_bool print_array(const cJSON * const item, const size_t depth, cons
update_offset(output_buffer); update_offset(output_buffer);
if (current_element->next) if (current_element->next)
{ {
length = format ? 2 : 1; length = (size_t) (format ? 2 : 1);
output_pointer = ensure(output_buffer, length + 1, hooks); output_pointer = ensure(output_buffer, length + 1, hooks);
if (output_pointer == NULL) 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: */ /* 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); output_pointer = ensure(output_buffer, length + 1, hooks);
if (output_pointer == NULL) 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); update_offset(output_buffer);
length = format ? 2 : 1; length = (size_t) (format ? 2 : 1);
output_pointer = ensure(output_buffer, length, hooks); output_pointer = ensure(output_buffer, length, hooks);
if (output_pointer == NULL) 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); update_offset(output_buffer);
/* print comma if not last */ /* 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); output_pointer = ensure(output_buffer, length + 1, hooks);
if (output_pointer == NULL) if (output_pointer == NULL)
{ {

4
cJSON_Utils.c
View File

@ -230,11 +230,11 @@ static void cJSONUtils_InplaceDecodePointerString(unsigned char *string)
for (; *string; (void)s2++, string++) for (; *string; (void)s2++, string++)
{ {
*s2 = (*string != '~') *s2 = (unsigned char) ((*string != '~')
? (*string) ? (*string)
: ((*(++string) == '0') : ((*(++string) == '0')
? '~' ? '~'
: '/'); : '/'));
} }
*s2 = '\0'; *s2 = '\0';