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: cJSON_ParseWithOpts

Browse Source
This commit is contained in:
Max Bruckner 2016-09-28 20:42:09 +07:00
parent f1dd51bfb5
commit e809022349
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cJSON.c
View File

@ -787,19 +787,43 @@ static const char *skip(const char *in)
/* Parse an object - create a new root, and populate. */ /* Parse an object - create a new root, and populate. */
cJSON *cJSON_ParseWithOpts(const char *value, const char **return_parse_end, int require_null_terminated) cJSON *cJSON_ParseWithOpts(const char *value, const char **return_parse_end, int require_null_terminated)
{ {
const char *end=0,**ep=return_parse_end?return_parse_end:&global_ep; const char *end = 0;
/* use global error pointer if no specific one was given */
const char **ep = return_parse_end ? return_parse_end : &global_ep;
cJSON *c = cJSON_New_Item(); cJSON *c = cJSON_New_Item();
*ep = 0; *ep = 0;
if (!c) return 0; /* memory fail */ if (!c) /* memory fail */
{
return 0;
}
end = parse_value(c, skip(value), ep); end = parse_value(c, skip(value), ep);
if (!end) {cJSON_Delete(c);return 0;} /* parse failure. ep is set. */ if (!end)
{
/* parse failure. ep is set. */
cJSON_Delete(c);
return 0;
}
/* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */ /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
if (require_null_terminated) {end=skip(end);if (*end) {cJSON_Delete(c);*ep=end;return 0;}} if (require_null_terminated)
if (return_parse_end) *return_parse_end=end; {
end = skip(end);
if (*end)
{
cJSON_Delete(c);
*ep = end;
return 0;
}
}
if (return_parse_end)
{
*return_parse_end = end;
}
return c; return c;
} }
/* Default options for cJSON_Parse */ /* Default options for cJSON_Parse */
cJSON *cJSON_Parse(const char *value) {return cJSON_ParseWithOpts(value,0,0);} cJSON *cJSON_Parse(const char *value) {return cJSON_ParseWithOpts(value,0,0);}