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

print_array: return boolean instead of pointer

Browse Source
This commit is contained in:
Max Bruckner 2017-03-03 00:16:54 +01:00
parent d441fa05b3
commit bea1d102fd
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cJSON.c
View File

@ -815,7 +815,7 @@ static unsigned char *print_string(const cJSON * const item, printbuffer * const
static const unsigned char *parse_value(cJSON * const item, const unsigned char * const input, const unsigned char ** const ep, const internal_hooks * const hooks); static const unsigned char *parse_value(cJSON * const item, const unsigned char * const input, const unsigned char ** const ep, const internal_hooks * const hooks);
static cJSON_bool print_value(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_value(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks);
static const unsigned char *parse_array(cJSON * const item, const unsigned char *input, const unsigned char ** const ep, const internal_hooks * const hooks); static const unsigned char *parse_array(cJSON * const item, const unsigned char *input, const unsigned char ** const ep, const internal_hooks * const hooks);
static unsigned char *print_array(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_array(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks);
static const unsigned char *parse_object(cJSON * const item, const unsigned char *input, const unsigned char ** const ep, const internal_hooks * const hooks); static const unsigned char *parse_object(cJSON * const item, const unsigned char *input, const unsigned char ** const ep, const internal_hooks * const hooks);
static unsigned char *print_object(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static unsigned char *print_object(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks);
@ -1096,8 +1096,7 @@ static cJSON_bool print_value(const cJSON * const item, const size_t depth, cons
output = print_string(item, output_buffer, hooks); output = print_string(item, output_buffer, hooks);
break; break;
case cJSON_Array: case cJSON_Array:
output = print_array(item, depth, format, output_buffer, hooks); return print_array(item, depth, format, output_buffer, hooks);
break;
case cJSON_Object: case cJSON_Object:
output = print_object(item, depth, format, output_buffer, hooks); output = print_object(item, depth, format, output_buffer, hooks);
break; break;
@ -1188,26 +1187,23 @@ fail:
} }
/* Render an array to text */ /* Render an array to text */
static unsigned char *print_array(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks) static cJSON_bool print_array(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks)
{ {
unsigned char *output = NULL;
unsigned char *output_pointer = NULL; unsigned char *output_pointer = NULL;
size_t length = 0; size_t length = 0;
cJSON *current_element = item->child; cJSON *current_element = item->child;
size_t output_offset = 0;
if (output_buffer == NULL) if (output_buffer == NULL)
{ {
return NULL; return false;
} }
/* Compose the output array. */ /* Compose the output array. */
/* opening square bracket */ /* opening square bracket */
output_offset = output_buffer->offset;
output_pointer = ensure(output_buffer, 1, hooks); output_pointer = ensure(output_buffer, 1, hooks);
if (output_pointer == NULL) if (output_pointer == NULL)
{ {
return NULL; return false;
} }
*output_pointer = '['; *output_pointer = '[';
@ -1217,7 +1213,7 @@ static unsigned char *print_array(const cJSON * const item, const size_t depth,
{ {
if (!print_value(current_element, depth + 1, format, output_buffer, hooks)) if (!print_value(current_element, depth + 1, format, output_buffer, hooks))
{ {
return NULL; return false;
} }
update_offset(output_buffer); update_offset(output_buffer);
if (current_element->next) if (current_element->next)
@ -1226,7 +1222,7 @@ static unsigned char *print_array(const cJSON * const item, const size_t depth,
output_pointer = ensure(output_buffer, length + 1, hooks); output_pointer = ensure(output_buffer, length + 1, hooks);
if (output_pointer == NULL) if (output_pointer == NULL)
{ {
return NULL; return false;
} }
*output_pointer++ = ','; *output_pointer++ = ',';
if(format) if(format)
@ -1242,13 +1238,12 @@ static unsigned char *print_array(const cJSON * const item, const size_t depth,
output_pointer = ensure(output_buffer, 2, hooks); output_pointer = ensure(output_buffer, 2, hooks);
if (output_pointer == NULL) if (output_pointer == NULL)
{ {
return NULL; return false;
} }
*output_pointer++ = ']'; *output_pointer++ = ']';
*output_pointer = '\0'; *output_pointer = '\0';
output = output_buffer->buffer + output_offset;
return output; return true;
} }
/* Build an object from the text. */ /* Build an object from the text. */

4
tests/print_array.c
View File

@ -50,10 +50,10 @@ static void assert_print_array(const char * const expected, const char * const i
memset(item, 0, sizeof(item)); memset(item, 0, sizeof(item));
TEST_ASSERT_NOT_NULL_MESSAGE(parse_array(item, (const unsigned char*)input, &error_pointer, &global_hooks), "Failed to parse array."); TEST_ASSERT_NOT_NULL_MESSAGE(parse_array(item, (const unsigned char*)input, &error_pointer, &global_hooks), "Failed to parse array.");
TEST_ASSERT_NOT_NULL_MESSAGE(print_array(item, 0, false, &unformatted_buffer, &global_hooks), "Failed to print unformatted string."); TEST_ASSERT_TRUE_MESSAGE(print_array(item, 0, false, &unformatted_buffer, &global_hooks), "Failed to print unformatted string.");
TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted array is not correct."); TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted array is not correct.");
TEST_ASSERT_NOT_NULL_MESSAGE(print_array(item, 0, true, &formatted_buffer, &global_hooks), "Failed to print formatted string."); TEST_ASSERT_TRUE_MESSAGE(print_array(item, 0, true, &formatted_buffer, &global_hooks), "Failed to print formatted string.");
TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, printed_formatted, "Formatted array is not correct."); TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, printed_formatted, "Formatted array is not correct.");
reset(item); reset(item);