aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-16 07:54:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-16 07:54:55 +0000
commit00d8c42d107113c2e25c74d7b3b164c07a23e279 (patch)
tree8fd0cf123c1e7461a3e46e0598c66175428015bf /package/libs
parent4ca62eb7a5fa7751c4ca3aed4cd6daf040eaccea (diff)
downloadupstream-00d8c42d107113c2e25c74d7b3b164c07a23e279.tar.gz
upstream-00d8c42d107113c2e25c74d7b3b164c07a23e279.tar.bz2
upstream-00d8c42d107113c2e25c74d7b3b164c07a23e279.zip
json-c: merge an upstream fix for a compiler warning (fixes #19187)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44826 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs')
-rw-r--r--package/libs/libjson-c/patches/001-backport_compile_fix.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/package/libs/libjson-c/patches/001-backport_compile_fix.patch b/package/libs/libjson-c/patches/001-backport_compile_fix.patch
new file mode 100644
index 0000000000..e83f5d28a3
--- /dev/null
+++ b/package/libs/libjson-c/patches/001-backport_compile_fix.patch
@@ -0,0 +1,23 @@
+commit 3859e99f50abe11a8dade28efa9ea3d99dfaac11
+Author: Petar Koretić <petar.koretic@gmail.com>
+Date: Fri Apr 11 10:03:40 2014 +0200
+
+ Remove unused variable 'size'
+
+diff --git a/json_tokener.c b/json_tokener.c
+index 19de8ef..9a76293 100644
+--- a/json_tokener.c
++++ b/json_tokener.c
+@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
+
+ case json_tokener_state_inf: /* aka starts with 'i' */
+ {
+- int size;
+ int size_inf;
+ int is_negative = 0;
+
+ printbuf_memappend_fast(tok->pb, &c, 1);
+- size = json_min(tok->st_pos+1, json_null_str_len);
+ size_inf = json_min(tok->st_pos+1, json_inf_str_len);
+ char *infbuf = tok->pb->buf;
+ if (*infbuf == '-')