summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-06-15 16:09:49 (GMT)
committerThomas Haller <thaller@redhat.com>2017-06-15 16:52:53 (GMT)
commitcda0d805aa62eed5264099d42455114277fd12cf (patch)
tree713ea58baa699d1e2382f2b9123d996e8ed99cf9
parenta0ed1e2c38bb0728f5a84ca0f9591d580a4e4183 (diff)
downloadlibnl-cda0d805aa62eed5264099d42455114277fd12cf.zip
libnl-cda0d805aa62eed5264099d42455114277fd12cf.tar.gz
libnl-cda0d805aa62eed5264099d42455114277fd12cf.tar.bz2
all: avoid compiler warnings -Wimplicit-fallthrough
-rw-r--r--lib/hash.c46
-rw-r--r--src/lib/utils.c1
2 files changed, 24 insertions, 23 deletions
diff --git a/lib/hash.c b/lib/hash.c
index 47c938b..0276b2c 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -321,17 +321,17 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t *val2 )
/*-------------------------------- 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; /* fall through */
+ case 11: c+=((uint32_t)k[10])<<16; /* fall through */
+ case 10: c+=((uint32_t)k[9])<<8; /* fall through */
+ case 9 : c+=k[8]; /* fall through */
+ case 8 : b+=((uint32_t)k[7])<<24; /* fall through */
+ case 7 : b+=((uint32_t)k[6])<<16; /* fall through */
+ case 6 : b+=((uint32_t)k[5])<<8; /* fall through */
+ case 5 : b+=k[4]; /* fall through */
+ case 4 : a+=((uint32_t)k[3])<<24; /* fall through */
+ case 3 : a+=((uint32_t)k[2])<<16; /* fall through */
+ case 2 : a+=((uint32_t)k[1])<<8; /* fall through */
case 1 : a+=k[0];
break;
case 0 : return c;
@@ -451,18 +451,18 @@ static uint32_t hashbig( const void *key, size_t length, uint32_t *val2)
/*-------------------------------- last block: affect all 32 bits of (c) */
switch(length) /* all the case statements fall through */
{
- case 12: c+=k[11];
- case 11: c+=((uint32_t)k[10])<<8;
- case 10: c+=((uint32_t)k[9])<<16;
- case 9 : c+=((uint32_t)k[8])<<24;
- case 8 : b+=k[7];
- case 7 : b+=((uint32_t)k[6])<<8;
- case 6 : b+=((uint32_t)k[5])<<16;
- case 5 : b+=((uint32_t)k[4])<<24;
- case 4 : a+=k[3];
- case 3 : a+=((uint32_t)k[2])<<8;
- case 2 : a+=((uint32_t)k[1])<<16;
- case 1 : a+=((uint32_t)k[0])<<24;
+ case 12: c+=k[11]; /* fall through */
+ case 11: c+=((uint32_t)k[10])<<8; /* fall through */
+ case 10: c+=((uint32_t)k[9])<<16; /* fall through */
+ case 9 : c+=((uint32_t)k[8])<<24; /* fall through */
+ case 8 : b+=k[7]; /* fall through */
+ case 7 : b+=((uint32_t)k[6])<<8; /* fall through */
+ case 6 : b+=((uint32_t)k[5])<<16; /* fall through */
+ case 5 : b+=((uint32_t)k[4])<<24; /* fall through */
+ case 4 : a+=k[3]; /* fall through */
+ case 3 : a+=((uint32_t)k[2])<<8; /* fall through */
+ case 2 : a+=((uint32_t)k[1])<<16; /* fall through */
+ case 1 : a+=((uint32_t)k[0])<<24; /* fall through */
break;
case 0 : return c;
}
diff --git a/src/lib/utils.c b/src/lib/utils.c
index 6e288b6..1886159 100644
--- a/src/lib/utils.c
+++ b/src/lib/utils.c
@@ -179,6 +179,7 @@ int nl_cli_confirm(struct nl_object *obj, struct nl_dump_params *params,
switch ((answer = tolower(buf[0]))) {
case '\n':
answer = default_yes ? 'y' : 'n';
+ /* fall through */
case 'y':
case 'n':
return answer == 'y';