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

Merge pull request #310 from marxin/fix-gcc7-warnings

Browse Source 
Add FALLTHRU comment to handle GCC7 warnings.
This commit is contained in:
Eric Haszlakiewicz
2017-03-22 23:37:14 -04:00
committed by GitHub
parent 82f5a4ab29 014924ba89
commit 4e673656a1
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

@@ -677,6 +677,7 @@ int64_t json_object_get_int64(const struct json_object *jso)
case json_type_string: case json_type_string:
if (json_parse_int64(get_string_component(jso), &cint) == 0) if (json_parse_int64(get_string_component(jso), &cint) == 0)
return cint; return cint;
/* FALLTHRU */
default: default:
return 0; return 0;
} }

1
json_tokener.c
View File

@@ -341,6 +341,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;
} }
/* FALLTHRU */
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

@@ -415,17 +415,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; /* FALLTHRU */
case 11: c+=((uint32_t)k[10])<<16; case 11: c+=((uint32_t)k[10])<<16; /* FALLTHRU */
case 10: c+=((uint32_t)k[9])<<8; case 10: c+=((uint32_t)k[9])<<8; /* FALLTHRU */
case 9 : c+=k[8]; case 9 : c+=k[8]; /* FALLTHRU */
case 8 : b+=((uint32_t)k[7])<<24; case 8 : b+=((uint32_t)k[7])<<24; /* FALLTHRU */
case 7 : b+=((uint32_t)k[6])<<16; case 7 : b+=((uint32_t)k[6])<<16; /* FALLTHRU */
case 6 : b+=((uint32_t)k[5])<<8; case 6 : b+=((uint32_t)k[5])<<8; /* FALLTHRU */
case 5 : b+=k[4]; case 5 : b+=k[4]; /* FALLTHRU */
case 4 : a+=((uint32_t)k[3])<<24; case 4 : a+=((uint32_t)k[3])<<24; /* FALLTHRU */
case 3 : a+=((uint32_t)k[2])<<16; case 3 : a+=((uint32_t)k[2])<<16; /* FALLTHRU */
case 2 : a+=((uint32_t)k[1])<<8; case 2 : a+=((uint32_t)k[1])<<8; /* FALLTHRU */
case 1 : a+=k[0]; case 1 : a+=k[0];
break; break;
case 0 : return c; case 0 : return c;