github
/
cJSON
mirror of https://github.com/DaveGamble/cJSON.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Move 'format' into printbuffer

pull/160/head
Max Bruckner 8 years ago
parent
79f30800ec
commit
c4c217f2ce
6 changed files with 47 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      cJSON.c
  2. 10
      tests/print_array.c
  3. 2
      tests/print_number.c
  4. 10
      tests/print_object.c
  5. 2
      tests/print_string.c
  6. 4
      tests/print_value.c

57
cJSON.c
View File

@ -317,6 +317,7 @@ typedef struct
size_t offset; size_t offset;
size_t depth; /* current nesting depth (for formatted printing) */ size_t depth; /* current nesting depth (for formatted printing) */
cJSON_bool noalloc; cJSON_bool noalloc;
cJSON_bool format; /* is this print a formatted print */
} printbuffer; } printbuffer;
/* realloc printbuffer if necessary to have at least "needed" bytes more */ /* realloc printbuffer if necessary to have at least "needed" bytes more */
@ -928,11 +929,11 @@ static cJSON_bool print_string(const cJSON * const item, printbuffer * const p,
/* Predeclare these prototypes. */ /* Predeclare these prototypes. */
static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer, const internal_hooks * const hooks); static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer, const internal_hooks * const hooks);
static cJSON_bool print_value(const cJSON * const item, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer, const internal_hooks * const hooks);
static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer, const internal_hooks * const hooks); static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer, const internal_hooks * const hooks);
static cJSON_bool print_array(const cJSON * const item, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer, const internal_hooks * const hooks);
static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer, const internal_hooks * const hooks); static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer, const internal_hooks * const hooks);
static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer, const internal_hooks * const hooks);
/* Utility to jump whitespace and cr/lf */ /* Utility to jump whitespace and cr/lf */
static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer) static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
@ -1053,13 +1054,14 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
/* create buffer */ /* create buffer */
buffer->buffer = (unsigned char*) hooks->allocate(256); buffer->buffer = (unsigned char*) hooks->allocate(256);
buffer->format = format;
if (buffer->buffer == NULL) if (buffer->buffer == NULL)
{ {
goto fail; goto fail;
} }
/* print the value */ /* print the value */
if (!print_value(item, format, buffer, hooks)) if (!print_value(item, buffer, hooks))
{ {
goto fail; goto fail;
} }
@ -1117,7 +1119,7 @@ CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt) CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
{ {
printbuffer p = { 0, 0, 0, 0, 0 }; printbuffer p = { 0, 0, 0, 0, 0, 0 };
if (prebuffer < 0) if (prebuffer < 0)
{ {
@ -1133,8 +1135,9 @@ CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON
p.length = (size_t)prebuffer; p.length = (size_t)prebuffer;
p.offset = 0; p.offset = 0;
p.noalloc = false; p.noalloc = false;
p.format = fmt;
if (!print_value(item, fmt, &p, &global_hooks)) if (!print_value(item, &p, &global_hooks))
{ {
return NULL; return NULL;
} }
@ -1144,7 +1147,7 @@ CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON
CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cJSON_bool fmt) CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cJSON_bool fmt)
{ {
printbuffer p = { 0, 0, 0, 0, 0 }; printbuffer p = { 0, 0, 0, 0, 0, 0 };
if (len < 0) if (len < 0)
{ {
@ -1155,7 +1158,9 @@ CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const i
p.length = (size_t)len; p.length = (size_t)len;
p.offset = 0; p.offset = 0;
p.noalloc = true; p.noalloc = true;
return print_value(item, fmt, &p, &global_hooks); p.format = fmt;
return print_value(item, &p, &global_hooks);
} }
/* Parser core - when encountering text, process appropriately. */ /* Parser core - when encountering text, process appropriately. */
@ -1215,7 +1220,7 @@ static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buf
} }
/* Render a value to text. */ /* Render a value to text. */
static cJSON_bool print_value(const cJSON * const item, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks) static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer, const internal_hooks * const hooks)
{ {
unsigned char *output = NULL; unsigned char *output = NULL;
@ -1282,10 +1287,10 @@ static cJSON_bool print_value(const cJSON * const item, const cJSON_bool format,
return print_string(item, output_buffer, hooks); return print_string(item, output_buffer, hooks);
case cJSON_Array: case cJSON_Array:
return print_array(item, format, output_buffer, hooks); return print_array(item, output_buffer, hooks);
case cJSON_Object: case cJSON_Object:
return print_object(item, format, output_buffer, hooks); return print_object(item, output_buffer, hooks);
default: default:
return false; return false;
@ -1387,7 +1392,7 @@ fail:
} }
/* Render an array to text */ /* Render an array to text */
static cJSON_bool print_array(const cJSON * const item, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks) static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer, const internal_hooks * const hooks)
{ {
unsigned char *output_pointer = NULL; unsigned char *output_pointer = NULL;
size_t length = 0; size_t length = 0;
@ -1412,21 +1417,21 @@ static cJSON_bool print_array(const cJSON * const item, const cJSON_bool format,
while (current_element != NULL) while (current_element != NULL)
{ {
if (!print_value(current_element, format, output_buffer, hooks)) if (!print_value(current_element, output_buffer, hooks))
{ {
return false; return false;
} }
update_offset(output_buffer); update_offset(output_buffer);
if (current_element->next) if (current_element->next)
{ {
length = (size_t) (format ? 2 : 1); length = (size_t) (output_buffer->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)
{ {
return false; return false;
} }
*output_pointer++ = ','; *output_pointer++ = ',';
if(format) if(output_buffer->format)
{ {
*output_pointer++ = ' '; *output_pointer++ = ' ';
} }
@ -1558,7 +1563,7 @@ fail:
} }
/* Render an object to text. */ /* Render an object to text. */
static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks) static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer, const internal_hooks * const hooks)
{ {
unsigned char *output_pointer = NULL; unsigned char *output_pointer = NULL;
size_t length = 0; size_t length = 0;
@ -1570,7 +1575,7 @@ static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format
} }
/* Compose the output: */ /* Compose the output: */
length = (size_t) (format ? 2 : 1); /* fmt: {\n */ length = (size_t) (output_buffer->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)
{ {
@ -1579,7 +1584,7 @@ static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format
*output_pointer++ = '{'; *output_pointer++ = '{';
output_buffer->depth++; output_buffer->depth++;
if (format) if (output_buffer->format)
{ {
*output_pointer++ = '\n'; *output_pointer++ = '\n';
} }
@ -1587,7 +1592,7 @@ static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format
while (current_item) while (current_item)
{ {
if (format) if (output_buffer->format)
{ {
size_t i; size_t i;
output_pointer = ensure(output_buffer, output_buffer->depth, hooks); output_pointer = ensure(output_buffer, output_buffer->depth, hooks);
@ -1609,28 +1614,28 @@ static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format
} }
update_offset(output_buffer); update_offset(output_buffer);
length = (size_t) (format ? 2 : 1); length = (size_t) (output_buffer->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)
{ {
return false; return false;
} }
*output_pointer++ = ':'; *output_pointer++ = ':';
if (format) if (output_buffer->format)
{ {
*output_pointer++ = '\t'; *output_pointer++ = '\t';
} }
output_buffer->offset += length; output_buffer->offset += length;
/* print value */ /* print value */
if (!print_value(current_item, format, output_buffer, hooks)) if (!print_value(current_item, output_buffer, hooks))
{ {
return false; return false;
} }
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) ((output_buffer->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)
{ {
@ -1641,7 +1646,7 @@ static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format
*output_pointer++ = ','; *output_pointer++ = ',';
} }
if (format) if (output_buffer->format)
{ {
*output_pointer++ = '\n'; *output_pointer++ = '\n';
} }
@ -1651,12 +1656,12 @@ static cJSON_bool print_object(const cJSON * const item, const cJSON_bool format
current_item = current_item->next; current_item = current_item->next;
} }
output_pointer = ensure(output_buffer, format ? (output_buffer->depth + 1) : 2, hooks); output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2, hooks);
if (output_pointer == NULL) if (output_pointer == NULL)
{ {
return false; return false;
} }
if (format) if (output_buffer->format)
{ {
size_t i; size_t i;
for (i = 0; i < (output_buffer->depth - 1); i++) for (i = 0; i < (output_buffer->depth - 1); i++)

10
tests/print_array.c
View File

@ -31,8 +31,8 @@ static void assert_print_array(const char * const expected, const char * const i
cJSON item[1]; cJSON item[1];
printbuffer formatted_buffer = { 0, 0, 0, 0, 0 }; printbuffer formatted_buffer = { 0, 0, 0, 0, 0, 0 };
printbuffer unformatted_buffer = { 0, 0, 0, 0, 0 }; printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, 0 };
parse_buffer parsebuffer = { 0, 0, 0, 0 }; parse_buffer parsebuffer = { 0, 0, 0, 0 };
parsebuffer.content = (const unsigned char*)input; parsebuffer.content = (const unsigned char*)input;
@ -53,10 +53,12 @@ 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_TRUE_MESSAGE(parse_array(item, &parsebuffer, &global_hooks), "Failed to parse array."); TEST_ASSERT_TRUE_MESSAGE(parse_array(item, &parsebuffer, &global_hooks), "Failed to parse array.");
TEST_ASSERT_TRUE_MESSAGE(print_array(item, false, &unformatted_buffer, &global_hooks), "Failed to print unformatted string."); unformatted_buffer.format = false;
TEST_ASSERT_TRUE_MESSAGE(print_array(item, &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_TRUE_MESSAGE(print_array(item, true, &formatted_buffer, &global_hooks), "Failed to print formatted string."); formatted_buffer.format = true;
TEST_ASSERT_TRUE_MESSAGE(print_array(item, &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);

2
tests/print_number.c
View File

@ -28,7 +28,7 @@ static void assert_print_number(const char *expected, double input)
{ {
unsigned char printed[1024]; unsigned char printed[1024];
cJSON item[1]; cJSON item[1];
printbuffer buffer = { 0, 0, 0, 0, 0 }; printbuffer buffer = { 0, 0, 0, 0, 0, 0 };
buffer.buffer = printed; buffer.buffer = printed;
buffer.length = sizeof(printed); buffer.length = sizeof(printed);
buffer.offset = 0; buffer.offset = 0;

10
tests/print_object.c
View File

@ -31,8 +31,8 @@ static void assert_print_object(const char * const expected, const char * const
cJSON item[1]; cJSON item[1];
printbuffer formatted_buffer = { 0, 0, 0, 0, 0 }; printbuffer formatted_buffer = { 0, 0, 0, 0, 0, 0 };
printbuffer unformatted_buffer = { 0, 0, 0, 0, 0 }; printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, 0 };
parse_buffer parsebuffer = { 0, 0, 0, 0 }; parse_buffer parsebuffer = { 0, 0, 0, 0 };
/* buffer for parsing */ /* buffer for parsing */
@ -54,10 +54,12 @@ static void assert_print_object(const char * const expected, const char * const
memset(item, 0, sizeof(item)); memset(item, 0, sizeof(item));
TEST_ASSERT_TRUE_MESSAGE(parse_object(item, &parsebuffer, &global_hooks), "Failed to parse object."); TEST_ASSERT_TRUE_MESSAGE(parse_object(item, &parsebuffer, &global_hooks), "Failed to parse object.");
TEST_ASSERT_TRUE_MESSAGE(print_object(item, false, &unformatted_buffer, &global_hooks), "Failed to print unformatted string."); unformatted_buffer.format = false;
TEST_ASSERT_TRUE_MESSAGE(print_object(item, &unformatted_buffer, &global_hooks), "Failed to print unformatted string.");
TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted object is not correct."); TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted object is not correct.");
TEST_ASSERT_TRUE_MESSAGE(print_object(item, true, &formatted_buffer, &global_hooks), "Failed to print formatted string."); formatted_buffer.format = true;
TEST_ASSERT_TRUE_MESSAGE(print_object(item, &formatted_buffer, &global_hooks), "Failed to print formatted string.");
TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, printed_formatted, "Formatted ojbect is not correct."); TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, printed_formatted, "Formatted ojbect is not correct.");
reset(item); reset(item);

2
tests/print_string.c
View File

@ -27,7 +27,7 @@
static void assert_print_string(const char *expected, const char *input) static void assert_print_string(const char *expected, const char *input)
{ {
unsigned char printed[1024]; unsigned char printed[1024];
printbuffer buffer = { 0, 0, 0, 0, 0 }; printbuffer buffer = { 0, 0, 0, 0, 0, 0 };
buffer.buffer = printed; buffer.buffer = printed;
buffer.length = sizeof(printed); buffer.length = sizeof(printed);
buffer.offset = 0; buffer.offset = 0;

4
tests/print_value.c
View File

@ -32,7 +32,7 @@ static void assert_print_value(const char *input)
{ {
unsigned char printed[1024]; unsigned char printed[1024];
cJSON item[1]; cJSON item[1];
printbuffer buffer = { 0, 0, 0, 0, 0 }; printbuffer buffer = { 0, 0, 0, 0, 0, 0 };
parse_buffer parsebuffer = { 0, 0, 0, 0 }; parse_buffer parsebuffer = { 0, 0, 0, 0 };
buffer.buffer = printed; buffer.buffer = printed;
buffer.length = sizeof(printed); buffer.length = sizeof(printed);
@ -46,7 +46,7 @@ static void assert_print_value(const char *input)
TEST_ASSERT_TRUE_MESSAGE(parse_value(item, &parsebuffer, &global_hooks), "Failed to parse value."); TEST_ASSERT_TRUE_MESSAGE(parse_value(item, &parsebuffer, &global_hooks), "Failed to parse value.");
TEST_ASSERT_TRUE_MESSAGE(print_value(item, false, &buffer, &global_hooks), "Failed to print value."); TEST_ASSERT_TRUE_MESSAGE(print_value(item, &buffer, &global_hooks), "Failed to print value.");
TEST_ASSERT_EQUAL_STRING_MESSAGE(input, buffer.buffer, "Printed value is not as expected."); TEST_ASSERT_EQUAL_STRING_MESSAGE(input, buffer.buffer, "Printed value is not as expected.");
reset(item); reset(item);

Write Preview
Loading…
Cancel
Save