summaryrefslogtreecommitdiff
path: root/json
diff options
context:
space:
mode:
Diffstat (limited to 'json')
-rw-r--r--json/README26
-rw-r--r--json/hex-chars.jmb1.p12
-rw-r--r--json/void-prototypes.jmb1.p45
3 files changed, 83 insertions, 0 deletions
diff --git a/json/README b/json/README
new file mode 100644
index 0000000..50dcf79
--- /dev/null
+++ b/json/README
@@ -0,0 +1,26 @@
+JSON-C patches
+==============
+
+This directory contains a couple of patches to JSON-C 0.7.
+Upstream sources may be found at http://oss.metaparadigm.com/json-c/
+
+hex-chars.jmb1.p:
+
+ Fix handling of upper case hex digits.
+ The previous behaviour resulted in the likes of \uFFFD causing a parse
+ error.
+
+void-prototypes.jmb1.p:
+
+ Fix compiler warnings about function prototypes in header files when
+ compiling client code in standards mode with pedantic warnings switched
+ on.
+
+Apply them as follows:
+
+ $ cd json-c-0.7
+ $ patch -p 1 -i ../hex-chars.jmb1.p
+ $ patch -p 1 -i ../void-prototypes.jmb1.p
+
+They have been submitted upstream, so will probably disappear in due
+course.
diff --git a/json/hex-chars.jmb1.p b/json/hex-chars.jmb1.p
new file mode 100644
index 0000000..10ea30a
--- /dev/null
+++ b/json/hex-chars.jmb1.p
@@ -0,0 +1,12 @@
+diff -urw json-c-0.7/json_object.c json-c-0.7-jmb/json_object.c
+--- json-c-0.7/json_object.c 2007-03-13 08:25:39.000000000 +0000
++++ json-c-0.7-jmb/json_object.c 2007-06-23 13:33:20.000000000 +0100
+@@ -30,7 +30,7 @@
+ /* #define REFCOUNT_DEBUG 1 */
+
+ char *json_number_chars = "0123456789.+-e";
+-char *json_hex_chars = "0123456789abcdef";
++char *json_hex_chars = "0123456789abcdefABCDEF";
+
+ #ifdef REFCOUNT_DEBUG
+ static char* json_type_name[] = {
diff --git a/json/void-prototypes.jmb1.p b/json/void-prototypes.jmb1.p
new file mode 100644
index 0000000..db71ffe
--- /dev/null
+++ b/json/void-prototypes.jmb1.p
@@ -0,0 +1,45 @@
+diff -urw json-c-0.7/debug.h json-c-0.7-jmb/debug.h
+--- json-c-0.7/debug.h 2007-03-13 08:25:39.000000000 +0000
++++ json-c-0.7-jmb/debug.h 2007-06-22 23:52:37.000000000 +0100
+@@ -13,7 +13,7 @@
+ #define _DEBUG_H_
+
+ extern void mc_set_debug(int debug);
+-extern int mc_get_debug();
++extern int mc_get_debug(void);
+
+ extern void mc_set_syslog(int syslog);
+ extern void mc_abort(const char *msg, ...);
+diff -urw json-c-0.7/json_object.h json-c-0.7-jmb/json_object.h
+--- json-c-0.7/json_object.h 2007-03-13 08:25:39.000000000 +0000
++++ json-c-0.7-jmb/json_object.h 2007-06-22 23:53:10.000000000 +0100
+@@ -98,7 +98,7 @@
+ /** Create a new empty object
+ * @returns a json_object of type json_type_object
+ */
+-extern struct json_object* json_object_new_object();
++extern struct json_object* json_object_new_object(void);
+
+ /** Get the hashtable of a json_object of type json_type_object
+ * @param obj the json_object instance
+@@ -167,7 +167,7 @@
+ /** Create a new empty json_object of type json_type_array
+ * @returns a json_object of type json_type_array
+ */
+-extern struct json_object* json_object_new_array();
++extern struct json_object* json_object_new_array(void);
+
+ /** Get the arraylist of a json_object of type json_type_array
+ * @param obj the json_object instance
+diff -urw json-c-0.7/json_tokener.h json-c-0.7-jmb/json_tokener.h
+--- json-c-0.7/json_tokener.h 2007-03-13 08:25:39.000000000 +0000
++++ json-c-0.7-jmb/json_tokener.h 2007-06-22 23:53:26.000000000 +0100
+@@ -79,7 +79,7 @@
+
+ extern const char* json_tokener_errors[];
+
+-extern struct json_tokener* json_tokener_new();
++extern struct json_tokener* json_tokener_new(void);
+ extern void json_tokener_free(struct json_tokener *tok);
+ extern void json_tokener_reset(struct json_tokener *tok);
+ extern struct json_object* json_tokener_parse(char *str);