Skip to content

Commit

Permalink
Merge pull request #365 from mbehr1/json-c-0.12
Browse files Browse the repository at this point in the history
added fallthrough for gcc7
  • Loading branch information
hawicz committed Oct 4, 2017
2 parents acbcc06 + ec8912b commit ddc97b2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
1 change: 1 addition & 0 deletions json_object.c
Expand Up @@ -552,6 +552,7 @@ int64_t json_object_get_int64(struct json_object *jso)
return jso->o.c_boolean;
case json_type_string:
if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint;
// fallthrough
default:
return 0;
}
Expand Down
1 change: 1 addition & 0 deletions json_tokener.c
Expand Up @@ -305,6 +305,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
tok->err = json_tokener_error_parse_unexpected;
goto out;
}
// fallthrough
case '"':
state = json_tokener_state_string;
printbuf_reset(tok->pb);
Expand Down
22 changes: 11 additions & 11 deletions linkhash.c
Expand Up @@ -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) */
switch(length) /* all the case statements fall through */
{
case 12: c+=((uint32_t)k[11])<<24;
case 11: c+=((uint32_t)k[10])<<16;
case 10: c+=((uint32_t)k[9])<<8;
case 9 : c+=k[8];
case 8 : b+=((uint32_t)k[7])<<24;
case 7 : b+=((uint32_t)k[6])<<16;
case 6 : b+=((uint32_t)k[5])<<8;
case 5 : b+=k[4];
case 4 : a+=((uint32_t)k[3])<<24;
case 3 : a+=((uint32_t)k[2])<<16;
case 2 : a+=((uint32_t)k[1])<<8;
case 12: c+=((uint32_t)k[11])<<24; // fallthrough
case 11: c+=((uint32_t)k[10])<<16; // fallthrough
case 10: c+=((uint32_t)k[9])<<8; // fallthrough
case 9 : c+=k[8]; // fallthrough
case 8 : b+=((uint32_t)k[7])<<24; // fallthrough
case 7 : b+=((uint32_t)k[6])<<16; // fallthrough
case 6 : b+=((uint32_t)k[5])<<8; // fallthrough
case 5 : b+=k[4]; // fallthrough
case 4 : a+=((uint32_t)k[3])<<24; // fallthrough
case 3 : a+=((uint32_t)k[2])<<16; // fallthrough
case 2 : a+=((uint32_t)k[1])<<8; // fallthrough
case 1 : a+=k[0];
break;
case 0 : return c;
Expand Down

0 comments on commit ddc97b2

Please sign in to comment.