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_object: rename variables

Browse Source
This commit is contained in:
Max Bruckner 2017-02-20 15:57:22 +01:00
parent 6d5a7c8c40
commit b71db93e03
1 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
cJSON.c
View File

@ -786,7 +786,7 @@ static unsigned char *print_value(const cJSON * const item, const size_t depth,
static const unsigned char *parse_array(cJSON * const item, const unsigned char *input, const unsigned char ** const ep); static const unsigned char *parse_array(cJSON * const item, const unsigned char *input, const unsigned char ** const ep);
static unsigned char *print_array(const cJSON * const item, const size_t depth, const cjbool format, printbuffer * const output_buffer); static unsigned char *print_array(const cJSON * const item, const size_t depth, const cjbool format, printbuffer * const output_buffer);
static const unsigned char *parse_object(cJSON * const item, const unsigned char *input, const unsigned char ** const ep); static const unsigned char *parse_object(cJSON * const item, const unsigned char *input, const unsigned char ** const ep);
static unsigned char *print_object(const cJSON *item, size_t depth, cjbool fmt, printbuffer *p); static unsigned char *print_object(const cJSON * const item, size_t depth, const cjbool format, printbuffer * const output_buffer);
/* Utility to jump whitespace and cr/lf */ /* Utility to jump whitespace and cr/lf */
static const unsigned char *skip_whitespace(const unsigned char *in) static const unsigned char *skip_whitespace(const unsigned char *in)
@ -1312,152 +1312,152 @@ fail:
} }
/* Render an object to text. */ /* Render an object to text. */
static unsigned char *print_object(const cJSON *item, size_t depth, cjbool fmt, printbuffer *p) static unsigned char *print_object(const cJSON * const item, size_t depth, const cjbool format, printbuffer * const output_buffer)
{ {
unsigned char *out = NULL; unsigned char *output = NULL;
unsigned char *ptr = NULL; unsigned char *output_pointer = NULL;
size_t len = 7; size_t length = 7;
size_t i = 0; size_t i = 0;
size_t j = 0; size_t j = 0;
cJSON *child = item->child; cJSON *current_item = item->child;
size_t numentries = 0; size_t object_length = 0;
if (p == NULL) if (output_buffer == NULL)
{ {
return NULL; return NULL;
} }
/* Count the number of entries. */ /* Count the number of entries. */
while (child) while (current_item)
{ {
numentries++; object_length++;
child = child->next; current_item = current_item->next;
} }
/* Explicitly handle empty object case */ /* Explicitly handle empty object case */
if (!numentries) if (!object_length)
{ {
out = ensure(p, fmt ? depth + 4 : 3); output = ensure(output_buffer, format ? depth + 4 : 3);
if (out == NULL) if (output == NULL)
{ {
return NULL; return NULL;
} }
ptr = out; output_pointer = output;
*ptr++ = '{'; *output_pointer++ = '{';
if (fmt) { if (format) {
*ptr++ = '\n'; *output_pointer++ = '\n';
for (i = 0; i < depth; i++) for (i = 0; i < depth; i++)
{ {
*ptr++ = '\t'; *output_pointer++ = '\t';
} }
} }
*ptr++ = '}'; *output_pointer++ = '}';
*ptr++ = '\0'; *output_pointer++ = '\0';
return out; return output;
} }
/* Compose the output: */ /* Compose the output: */
i = p->offset; i = output_buffer->offset;
len = fmt ? 2 : 1; /* fmt: {\n */ length = format ? 2 : 1; /* fmt: {\n */
ptr = ensure(p, len + 1); output_pointer = ensure(output_buffer, length + 1);
if (ptr == NULL) if (output_pointer == NULL)
{ {
return NULL; return NULL;
} }
*ptr++ = '{'; *output_pointer++ = '{';
if (fmt) if (format)
{ {
*ptr++ = '\n'; *output_pointer++ = '\n';
} }
*ptr = '\0'; *output_pointer = '\0';
p->offset += len; output_buffer->offset += length;
child = item->child; current_item = item->child;
depth++; depth++;
while (child) while (current_item)
{ {
if (fmt) if (format)
{ {
ptr = ensure(p, depth); output_pointer = ensure(output_buffer, depth);
if (ptr == NULL) if (output_pointer == NULL)
{ {
return NULL; return NULL;
} }
for (j = 0; j < depth; j++) for (j = 0; j < depth; j++)
{ {
*ptr++ = '\t'; *output_pointer++ = '\t';
} }
p->offset += depth; output_buffer->offset += depth;
} }
/* print key */ /* print key */
if (!print_string_ptr((unsigned char*)child->string, p)) if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
{ {
return NULL; return NULL;
} }
update_offset(p); update_offset(output_buffer);
len = fmt ? 2 : 1; length = format ? 2 : 1;
ptr = ensure(p, len); output_pointer = ensure(output_buffer, length);
if (ptr == NULL) if (output_pointer == NULL)
{ {
return NULL; return NULL;
} }
*ptr++ = ':'; *output_pointer++ = ':';
if (fmt) if (format)
{ {
*ptr++ = '\t'; *output_pointer++ = '\t';
} }
p->offset+=len; output_buffer->offset += length;
/* print value */ /* print value */
if (!print_value(child, depth, fmt, p)) if (!print_value(current_item, depth, format, output_buffer))
{ {
return NULL; return NULL;
} }
update_offset(p); update_offset(output_buffer);
/* print comma if not last */ /* print comma if not last */
len = (size_t) (fmt ? 1 : 0) + (child->next ? 1 : 0); length = (size_t) (format ? 1 : 0) + (current_item->next ? 1 : 0);
ptr = ensure(p, len + 1); output_pointer = ensure(output_buffer, length + 1);
if (ptr == NULL) if (output_pointer == NULL)
{ {
return NULL; return NULL;
} }
if (child->next) if (current_item->next)
{ {
*ptr++ = ','; *output_pointer++ = ',';
} }
if (fmt) if (format)
{ {
*ptr++ = '\n'; *output_pointer++ = '\n';
} }
*ptr = '\0'; *output_pointer = '\0';
p->offset += len; output_buffer->offset += length;
child = child->next; current_item = current_item->next;
} }
ptr = ensure(p, fmt ? (depth + 1) : 2); output_pointer = ensure(output_buffer, format ? (depth + 1) : 2);
if (ptr == NULL) if (output_pointer == NULL)
{ {
return NULL; return NULL;
} }
if (fmt) if (format)
{ {
for (i = 0; i < (depth - 1); i++) for (i = 0; i < (depth - 1); i++)
{ {
*ptr++ = '\t'; *output_pointer++ = '\t';
} }
} }
*ptr++ = '}'; *output_pointer++ = '}';
*ptr = '\0'; *output_pointer = '\0';
out = (p->buffer) + i; output = (output_buffer->buffer) + i;
return out; return output;
} }
/* Get Array size/item / object item. */ /* Get Array size/item / object item. */