mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-12 11:58:34 +00:00
libfastjson: backport patch to fix compilation error
I've met the following compilation error. | ../git/json_object.c:415:3: error: jump skips variable initialization [-Werror=jump-misses-init] Backport a patch to fix it. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
4338cf346d
commit
a74abf155d
@ -0,0 +1,46 @@
|
|||||||
|
From d697182f18a421b7f80ea9de4914251b55d82532 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rainer Gerhards <rgerhards@adiscon.com>
|
||||||
|
Date: Sun, 15 Jul 2018 17:24:59 +0200
|
||||||
|
Subject: [PATCH] "fix" "jump-misses-init" gcc-8 warning
|
||||||
|
|
||||||
|
Actually, that warning is overly conservative, and so we
|
||||||
|
have changed the code in a somewhat suboptimal way to "fix"
|
||||||
|
it. In this spots, it's not that bad and we wanted to avoid
|
||||||
|
totally disabling this warning.
|
||||||
|
|
||||||
|
If it were more costly in terms of cleanness, we would probaly
|
||||||
|
have done that. Just mention it to tell anyone else the
|
||||||
|
cure is not really a good one, just selected due to the
|
||||||
|
circumstances in this special case.
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||||
|
---
|
||||||
|
json_object.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/json_object.c b/json_object.c
|
||||||
|
index 35338e1..6e67891 100644
|
||||||
|
--- a/json_object.c
|
||||||
|
+++ b/json_object.c
|
||||||
|
@@ -396,6 +396,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso)
|
||||||
|
{
|
||||||
|
struct _fjson_child *chld = NULL;
|
||||||
|
struct _fjson_child_pg *pg;
|
||||||
|
+ int pg_idx;
|
||||||
|
|
||||||
|
if (jso->o.c_obj.ndeleted > 0) {
|
||||||
|
/* we first fill deleted spots */
|
||||||
|
@@ -415,7 +416,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
- const int pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE;
|
||||||
|
+ pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE;
|
||||||
|
if (jso->o.c_obj.nelem > 0 && pg_idx == 0) {
|
||||||
|
if((pg = calloc(1, sizeof(struct _fjson_child_pg))) == NULL) {
|
||||||
|
errno = ENOMEM;
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f"
|
|||||||
|
|
||||||
DEPENDS = ""
|
DEPENDS = ""
|
||||||
|
|
||||||
SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https"
|
SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https \
|
||||||
|
file://0001-fix-jump-misses-init-gcc-8-warning.patch"
|
||||||
|
|
||||||
SRCREV = "4758b1caf69ada911ef79e1d80793fe489b98dff"
|
SRCREV = "4758b1caf69ada911ef79e1d80793fe489b98dff"
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user