3party/cJSON
0
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2025-01-14 03:18:00 +08:00
Code Issues Projects Releases Wiki Activity

print_array: rename variables

Browse Source
This commit is contained in:
Max Bruckner 2017-02-20 13:58:13 +01:00
parent 08770fc246
commit f16dd7e028
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
cJSON.c
View File

@ -784,7 +784,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); static const unsigned char *parse_value(cJSON * const item, const unsigned char * const input, const unsigned char ** const ep);
static unsigned char *print_value(const cJSON * const item, const size_t depth, const cjbool format, printbuffer * const output_buffer); static unsigned char *print_value(const cJSON * const item, const size_t depth, const cjbool format, printbuffer * const output_buffer);
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 *item, size_t depth, cjbool fmt, printbuffer *p); 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 *item, size_t depth, cjbool fmt, printbuffer *p);
@ -1152,87 +1152,87 @@ fail:
} }
/* Render an array to text */ /* Render an array to text */
static unsigned char *print_array(const cJSON *item, size_t depth, cjbool fmt, printbuffer *p) static unsigned char *print_array(const cJSON * const item, const 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 = 5; size_t length = 5;
cJSON *child = item->child; cJSON *current_element = item->child;
size_t numentries = 0; size_t array_length = 0;
size_t i = 0; size_t i = 0;
cjbool fail = false; cjbool fail = false;
if (p == NULL) if (output_buffer == NULL)
{ {
return NULL; return NULL;
} }
/* How many entries in the array? */ /* How many entries in the array? */
while (child) while (current_element)
{ {
numentries++; array_length++;
child = child->next; current_element = current_element->next;
} }
/* Explicitly handle numentries == 0 */ /* Explicitly handle empty arrays */
if (!numentries) if (array_length == 0)
{ {
out = ensure(p, 3); output = ensure(output_buffer, 3);
if (out != NULL) if (output != NULL)
{ {
strcpy((char*)out, "[]"); strcpy((char*)output, "[]");
} }
return out; return output;
} }
/* Compose the output array. */ /* Compose the output array. */
/* opening square bracket */ /* opening square bracket */
i = p->offset; i = output_buffer->offset;
ptr = ensure(p, 1); output_pointer = ensure(output_buffer, 1);
if (ptr == NULL) if (output_pointer == NULL)
{ {
return NULL; return NULL;
} }
*ptr = '['; *output_pointer = '[';
p->offset++; output_buffer->offset++;
child = item->child; current_element = item->child;
while (child && !fail) while (current_element && !fail)
{ {
if (!print_value(child, depth + 1, fmt, p)) if (!print_value(current_element, depth + 1, format, output_buffer))
{ {
return NULL; return NULL;
} }
p->offset = update(p); output_buffer->offset = update(output_buffer);
if (child->next) if (current_element->next)
{ {
len = fmt ? 2 : 1; length = format ? 2 : 1;
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++ = ' '; *output_pointer++ = ' ';
} }
*ptr = '\0'; *output_pointer = '\0';
p->offset += len; output_buffer->offset += length;
} }
child = child->next; current_element = current_element->next;
} }
ptr = ensure(p, 2); output_pointer = ensure(output_buffer, 2);
if (ptr == NULL) if (output_pointer == NULL)
{ {
return NULL; return NULL;
} }
*ptr++ = ']'; *output_pointer++ = ']';
*ptr = '\0'; *output_pointer = '\0';
out = (p->buffer) + i; output = (output_buffer->buffer) + i;
return out; return output;
} }
/* Build an object from the text. */ /* Build an object from the text. */