mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-08 06:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

added fallthrough for gcc7

Browse Source
This commit is contained in:
Matthias Behr
2017-10-03 09:26:59 +02:00
parent acbcc062f9
commit ec8912bb91
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
json_object.c
View File

@@ -552,6 +552,7 @@ int64_t json_object_get_int64(struct json_object *jso)
return jso->o.c_boolean; return jso->o.c_boolean;
case json_type_string: case json_type_string:
if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint; if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint;
// fallthrough
default: default:
return 0; return 0;
} }

1
json_tokener.c
View File

@@ -305,6 +305,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
tok->err = json_tokener_error_parse_unexpected; tok->err = json_tokener_error_parse_unexpected;
goto out; goto out;
} }
// fallthrough
case '"': case '"':
state = json_tokener_state_string; state = json_tokener_state_string;
printbuf_reset(tok->pb); printbuf_reset(tok->pb);

22
linkhash.c
View File

@@ -376,17 +376,17 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
/*-------------------------------- last block: affect all 32 bits of (c) */ /*-------------------------------- last block: affect all 32 bits of (c) */
switch(length) /* all the case statements fall through */ switch(length) /* all the case statements fall through */
{ {
case 12: c+=((uint32_t)k[11])<<24; case 12: c+=((uint32_t)k[11])<<24; // fallthrough
case 11: c+=((uint32_t)k[10])<<16; case 11: c+=((uint32_t)k[10])<<16; // fallthrough
case 10: c+=((uint32_t)k[9])<<8; case 10: c+=((uint32_t)k[9])<<8; // fallthrough
case 9 : c+=k[8]; case 9 : c+=k[8]; // fallthrough
case 8 : b+=((uint32_t)k[7])<<24; case 8 : b+=((uint32_t)k[7])<<24; // fallthrough
case 7 : b+=((uint32_t)k[6])<<16; case 7 : b+=((uint32_t)k[6])<<16; // fallthrough
case 6 : b+=((uint32_t)k[5])<<8; case 6 : b+=((uint32_t)k[5])<<8; // fallthrough
case 5 : b+=k[4]; case 5 : b+=k[4]; // fallthrough
case 4 : a+=((uint32_t)k[3])<<24; case 4 : a+=((uint32_t)k[3])<<24; // fallthrough
case 3 : a+=((uint32_t)k[2])<<16; case 3 : a+=((uint32_t)k[2])<<16; // fallthrough
case 2 : a+=((uint32_t)k[1])<<8; case 2 : a+=((uint32_t)k[1])<<8; // fallthrough
case 1 : a+=k[0]; case 1 : a+=k[0];
break; break;
case 0 : return c; case 0 : return c;