LineageOS/android_external_json-c
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add json_tokener_parse_verbose, and return NULL on parser errors

Browse Source 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@62 327403b1-1117-474d-bef2-5cb71233fd97
This commit is contained in:
Jehiah Czebotar
2010-12-08 03:52:07 +00:00
parent 5644272f03
commit a503ee8217
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
json_tokener.c
View File

@@ -115,11 +115,27 @@ struct json_object* json_tokener_parse(const char *str)
tok = json_tokener_new();
obj = json_tokener_parse_ex(tok, str, -1);
if(tok->err != json_tokener_success)
obj = (struct json_object*)error_ptr(-tok->err);
obj = NULL;
json_tokener_free(tok);
return obj;
}
struct json_object* json_tokener_parse_verbose(const char *str, enum json_tokener_error *error)
{
struct json_tokener* tok;
struct json_object* obj;
tok = json_tokener_new();
obj = json_tokener_parse_ex(tok, str, -1);
*error = tok->err;
if(tok->err != json_tokener_success) {
obj = NULL;
}
json_tokener_free(tok);
return obj;
}
#if !HAVE_STRNDUP
/* CAW: compliant version of strndup() */