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

Make the json_tokener_errors array local. It has been deprecated for a while, and json_tokener_error_desc() should be used instead.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2014-03-22 21:41:24 -04:00
parent 936d036ea3
commit f9136f6852
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
json_tokener.c
View File

@@ -66,8 +66,7 @@ static const int json_true_str_len = sizeof(json_true_str) - 1;
static const char json_false_str[] = "false"; static const char json_false_str[] = "false";
static const int json_false_str_len = sizeof(json_false_str) - 1; static const int json_false_str_len = sizeof(json_false_str) - 1;
// XXX after v0.10 this array will become static: static const char* json_tokener_errors[] = {
const char* json_tokener_errors[] = {
"success", "success",
"continue", "continue",
"nesting too deep", "nesting too deep",

8
json_tokener.h
View File

@@ -106,14 +106,6 @@ struct json_tokener
*/ */
const char *json_tokener_error_desc(enum json_tokener_error jerr); const char *json_tokener_error_desc(enum json_tokener_error jerr);
/**
* @b XXX do not use json_tokener_errors directly.
* After v0.10 this will be removed.
*
* See json_tokener_error_desc() instead.
*/
extern const char* json_tokener_errors[];
/** /**
* Retrieve the error caused by the last call to json_tokener_parse_ex(), * Retrieve the error caused by the last call to json_tokener_parse_ex(),
* or json_tokener_success if there is no error. * or json_tokener_success if there is no error.