mirror of
https://github.com/DaveGamble/cJSON
synced 2024-12-23 15:12:04 +00:00
Fix wconversion with old gcc (e.g. 4.3)
This commit is contained in:
parent
4ec6e76ea2
commit
466eb8e3f8
8
cJSON.c
8
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)
|
||||
{
|
||||
|
@ -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';
|
||||
|
Loading…
Reference in New Issue
Block a user