Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 7b24f8bd95ad4f7d00c93ca2ad998c14a0266dbe Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: marxin <mliska@suse.cz> |
| 3 | Date: Tue, 21 Mar 2017 08:42:11 +0100 |
| 4 | Subject: [PATCH] Add FALLTHRU comment to handle GCC7 warnings. |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 5 | |
| 6 | --- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 7 | Upstream-Status: Backport |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 9 | |
| 10 | json_object.c | 1 + |
| 11 | json_tokener.c | 1 + |
| 12 | linkhash.c | 22 +++++++++++----------- |
| 13 | 3 files changed, 13 insertions(+), 11 deletions(-) |
| 14 | |
| 15 | diff --git a/json_object.c b/json_object.c |
| 16 | index 6cc73bc..77e8b21 100644 |
| 17 | --- a/json_object.c |
| 18 | +++ b/json_object.c |
| 19 | @@ -552,6 +552,7 @@ int64_t json_object_get_int64(struct json_object *jso) |
| 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 | + /* FALLTHRU */ |
| 24 | default: |
| 25 | return 0; |
| 26 | } |
| 27 | diff --git a/json_tokener.c b/json_tokener.c |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | index 9a76293..ae7b1ae 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 29 | --- a/json_tokener.c |
| 30 | +++ b/json_tokener.c |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 31 | @@ -305,6 +305,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok, |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 32 | tok->err = json_tokener_error_parse_unexpected; |
| 33 | goto out; |
| 34 | } |
| 35 | + /* FALLTHRU */ |
| 36 | case '"': |
| 37 | state = json_tokener_state_string; |
| 38 | printbuf_reset(tok->pb); |
| 39 | diff --git a/linkhash.c b/linkhash.c |
| 40 | index 712c387..74e3b0f 100644 |
| 41 | --- a/linkhash.c |
| 42 | +++ b/linkhash.c |
| 43 | @@ -376,17 +376,17 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval) |
| 44 | /*-------------------------------- last block: affect all 32 bits of (c) */ |
| 45 | switch(length) /* all the case statements fall through */ |
| 46 | { |
| 47 | - case 12: c+=((uint32_t)k[11])<<24; |
| 48 | - case 11: c+=((uint32_t)k[10])<<16; |
| 49 | - case 10: c+=((uint32_t)k[9])<<8; |
| 50 | - case 9 : c+=k[8]; |
| 51 | - case 8 : b+=((uint32_t)k[7])<<24; |
| 52 | - case 7 : b+=((uint32_t)k[6])<<16; |
| 53 | - case 6 : b+=((uint32_t)k[5])<<8; |
| 54 | - case 5 : b+=k[4]; |
| 55 | - case 4 : a+=((uint32_t)k[3])<<24; |
| 56 | - case 3 : a+=((uint32_t)k[2])<<16; |
| 57 | - case 2 : a+=((uint32_t)k[1])<<8; |
| 58 | + case 12: c+=((uint32_t)k[11])<<24; /* FALLTHRU */ |
| 59 | + case 11: c+=((uint32_t)k[10])<<16; /* FALLTHRU */ |
| 60 | + case 10: c+=((uint32_t)k[9])<<8; /* FALLTHRU */ |
| 61 | + case 9 : c+=k[8]; /* FALLTHRU */ |
| 62 | + case 8 : b+=((uint32_t)k[7])<<24; /* FALLTHRU */ |
| 63 | + case 7 : b+=((uint32_t)k[6])<<16; /* FALLTHRU */ |
| 64 | + case 6 : b+=((uint32_t)k[5])<<8; /* FALLTHRU */ |
| 65 | + case 5 : b+=k[4]; /* FALLTHRU */ |
| 66 | + case 4 : a+=((uint32_t)k[3])<<24; /* FALLTHRU */ |
| 67 | + case 3 : a+=((uint32_t)k[2])<<16; /* FALLTHRU */ |
| 68 | + case 2 : a+=((uint32_t)k[1])<<8; /* FALLTHRU */ |
| 69 | case 1 : a+=k[0]; |
| 70 | break; |
| 71 | case 0 : return c; |
| 72 | -- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 73 | 2.12.2 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 74 | |