1 From 54e03b8693ccac182fd5d05473e01ecb37c281c8 Mon Sep 17 00:00:00 2001
2 From: marxin <mliska@suse.cz>
3 Date: Mon, 6 Jul 2020 20:09:15 +0800
4 Subject: [PATCH] Add FALLTHRU comment to handle GCC7 warnings.
6 https://github.com/json-c/json-c/commit/014924ba899f659917bb64392bbff7d3c803afc2
11 linkhash.c | 22 +++++++++++-----------
12 3 files changed, 15 insertions(+), 12 deletions(-)
14 diff --git a/json_object.c b/json_object.c
15 index f2b5ce0..5e867d0 100644
18 @@ -545,7 +545,8 @@ int64_t json_object_get_int64(struct json_object *jso)
19 case json_type_boolean:
20 return jso->o.c_boolean;
21 case json_type_string:
22 - if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint;
23 + if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint;
28 @@ -606,6 +607,7 @@ double json_object_get_double(struct json_object *jso)
29 return jso->o.c_boolean;
30 case json_type_string:
31 if(sscanf(jso->o.c_string.str, "%lf", &cdouble) == 1) return cdouble;
36 diff --git a/json_tokener.c b/json_tokener.c
37 index 7b3f3ec..54aa4f7 100644
40 @@ -341,6 +341,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
41 tok->err = json_tokener_error_parse_unexpected;
47 case json_tokener_state_finish:
48 diff --git a/linkhash.c b/linkhash.c
49 index 712c387..74e3b0f 100644
52 @@ -376,17 +376,17 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
53 /*-------------------------------- last block: affect all 32 bits of (c) */
54 switch(length) /* all the case statements fall through */
56 - case 12: c+=((uint32_t)k[11])<<24;
57 - case 11: c+=((uint32_t)k[10])<<16;
58 - case 10: c+=((uint32_t)k[9])<<8;
60 - case 8 : b+=((uint32_t)k[7])<<24;
61 - case 7 : b+=((uint32_t)k[6])<<16;
62 - case 6 : b+=((uint32_t)k[5])<<8;
64 - case 4 : a+=((uint32_t)k[3])<<24;
65 - case 3 : a+=((uint32_t)k[2])<<16;
66 - case 2 : a+=((uint32_t)k[1])<<8;
67 + case 12: c+=((uint32_t)k[11])<<24; /* FALLTHRU */
68 + case 11: c+=((uint32_t)k[10])<<16; /* FALLTHRU */
69 + case 10: c+=((uint32_t)k[9])<<8; /* FALLTHRU */
70 + case 9 : c+=k[8]; /* FALLTHRU */
71 + case 8 : b+=((uint32_t)k[7])<<24; /* FALLTHRU */
72 + case 7 : b+=((uint32_t)k[6])<<16; /* FALLTHRU */
73 + case 6 : b+=((uint32_t)k[5])<<8; /* FALLTHRU */
74 + case 5 : b+=k[4]; /* FALLTHRU */
75 + case 4 : a+=((uint32_t)k[3])<<24; /* FALLTHRU */
76 + case 3 : a+=((uint32_t)k[2])<<16; /* FALLTHRU */
77 + case 2 : a+=((uint32_t)k[1])<<8; /* FALLTHRU */