From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sun, 23 Mar 2014 01:41:24 +0000 (-0400)
Subject: Make the json_tokener_errors array local.  It has been deprecated for a while, and... 
X-Git-Tag: json-c-0.12-20140410~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9136f68520db4761f05810f97922900ba459f46;p=thirdparty%2Fjson-c.git

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

diff --git a/json_tokener.c b/json_tokener.c
index e4710e48..a1019c0a 100644
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -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 int json_false_str_len = sizeof(json_false_str) - 1;
 
-// XXX after v0.10 this array will become static:
-const char* json_tokener_errors[] = {
+static const char* json_tokener_errors[] = {
   "success",
   "continue",
   "nesting too deep",
diff --git a/json_tokener.h b/json_tokener.h
index 61f73d23..5471d97c 100644
--- a/json_tokener.h
+++ b/json_tokener.h
@@ -106,14 +106,6 @@ struct json_tokener
  */
 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(),
  * or json_tokener_success if there is no error.