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

reformatting: parse_array

Browse Source
This commit is contained in:
Max Bruckner 2016-09-28 22:07:06 +07:00
parent a9f752e034
commit ad711e6fab
1 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
cJSON.c
View File

@ -980,29 +980,68 @@ static char *print_value(cJSON *item, int depth, int fmt, printbuffer *p)
/* Build an array from input text. */ /* Build an array from input text. */
static const char *parse_array(cJSON *item,const char *value,const char **ep) static const char *parse_array(cJSON *item,const char *value,const char **ep)
{ {
cJSON *child; cJSON *child;
if (*value!='[') {*ep=value;return 0;} /* not an array! */ if (*value != '[')
{
/* not an array! */
*ep = value;
return 0;
}
item->type=cJSON_Array; item->type = cJSON_Array;
value=skip(value+1); value = skip(value + 1);
if (*value==']') return value+1; /* empty array. */ if (*value == ']')
{
/* empty array. */
return value + 1;
}
item->child=child=cJSON_New_Item(); item->child = child = cJSON_New_Item();
if (!item->child) return 0; /* memory fail */ if (!item->child)
value=skip(parse_value(child,skip(value),ep)); /* skip any spacing, get the value. */ {
if (!value) return 0; /* memory fail */
return 0;
}
/* skip any spacing, get the value. */
value = skip(parse_value(child, skip(value), ep));
if (!value)
{
return 0;
}
while (*value==',') /* loop through the comma separated array elements */
{ while (*value == ',')
cJSON *new_item; {
if (!(new_item=cJSON_New_Item())) return 0; /* memory fail */ cJSON *new_item;
child->next=new_item;new_item->prev=child;child=new_item; if (!(new_item = cJSON_New_Item()))
value=skip(parse_value(child,skip(value+1),ep)); {
if (!value) return 0; /* memory fail */ /* memory fail */
} return 0;
}
/* add new item to end of the linked list */
child->next = new_item;
new_item->prev = child;
child = new_item;
if (*value==']') return value+1; /* end of array */ /* go to the next comma */
*ep=value;return 0; /* malformed. */ value = skip(parse_value(child, skip(value + 1), ep));
if (!value)
{
/* memory fail */
return 0;
}
}
if (*value == ']')
{
/* end of array */
return value + 1;
}
/* malformed. */
*ep = value;
return 0;
} }
/* Render an array to text */ /* Render an array to text */