diff options
| author | Alvaro Herrera | 2020-05-13 19:31:14 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2020-05-13 19:31:14 +0000 |
| commit | 17cc133f017cb13737e23ce0da4415daf2c34cc3 (patch) | |
| tree | 45bd1e33f52902f315aa6364fd9fdf1ff152403a /src/common/hashfn.c | |
| parent | 81ca8686305c4c62d723ab224ad5c414f350a3a0 (diff) | |
Dial back -Wimplicit-fallthrough to level 3
The additional pain from level 4 is excessive for the gain.
Also revert all the source annotation changes to their original
wordings, to avoid back-patching pain.
Discussion: https://postgr.es/m/31166.1589378554@sss.pgh.pa.us
Diffstat (limited to 'src/common/hashfn.c')
| -rw-r--r-- | src/common/hashfn.c | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/src/common/hashfn.c b/src/common/hashfn.c index 29c846fcc31..990f18e610b 100644 --- a/src/common/hashfn.c +++ b/src/common/hashfn.c @@ -178,13 +178,13 @@ hash_bytes(const unsigned char *k, int keylen) { case 11: c += ((uint32) k[10] << 8); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 24); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += ka[1]; @@ -192,22 +192,22 @@ hash_bytes(const unsigned char *k, int keylen) break; case 7: b += ((uint32) k[6] << 8); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 16); - /* FALLTHROUGH */ + /* fall through */ case 5: b += ((uint32) k[4] << 24); - /* FALLTHROUGH */ + /* fall through */ case 4: a += ka[0]; break; case 3: a += ((uint32) k[2] << 8); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 16); - /* FALLTHROUGH */ + /* fall through */ case 1: a += ((uint32) k[0] << 24); /* case 0: nothing left to add */ @@ -217,13 +217,13 @@ hash_bytes(const unsigned char *k, int keylen) { case 11: c += ((uint32) k[10] << 24); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 8); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += ka[1]; @@ -231,22 +231,22 @@ hash_bytes(const unsigned char *k, int keylen) break; case 7: b += ((uint32) k[6] << 16); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 8); - /* FALLTHROUGH */ + /* fall through */ case 5: b += k[4]; - /* FALLTHROUGH */ + /* fall through */ case 4: a += ka[0]; break; case 3: a += ((uint32) k[2] << 16); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 8); - /* FALLTHROUGH */ + /* fall through */ case 1: a += k[0]; /* case 0: nothing left to add */ @@ -280,35 +280,35 @@ hash_bytes(const unsigned char *k, int keylen) { case 11: c += ((uint32) k[10] << 8); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 24); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += k[7]; - /* FALLTHROUGH */ + /* fall through */ case 7: b += ((uint32) k[6] << 8); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 16); - /* FALLTHROUGH */ + /* fall through */ case 5: b += ((uint32) k[4] << 24); - /* FALLTHROUGH */ + /* fall through */ case 4: a += k[3]; - /* FALLTHROUGH */ + /* fall through */ case 3: a += ((uint32) k[2] << 8); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 16); - /* FALLTHROUGH */ + /* fall through */ case 1: a += ((uint32) k[0] << 24); /* case 0: nothing left to add */ @@ -318,35 +318,35 @@ hash_bytes(const unsigned char *k, int keylen) { case 11: c += ((uint32) k[10] << 24); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 8); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += ((uint32) k[7] << 24); - /* FALLTHROUGH */ + /* fall through */ case 7: b += ((uint32) k[6] << 16); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 8); - /* FALLTHROUGH */ + /* fall through */ case 5: b += k[4]; - /* FALLTHROUGH */ + /* fall through */ case 4: a += ((uint32) k[3] << 24); - /* FALLTHROUGH */ + /* fall through */ case 3: a += ((uint32) k[2] << 16); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 8); - /* FALLTHROUGH */ + /* fall through */ case 1: a += k[0]; /* case 0: nothing left to add */ @@ -417,13 +417,13 @@ hash_bytes_extended(const unsigned char *k, int keylen, uint64 seed) { case 11: c += ((uint32) k[10] << 8); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 24); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += ka[1]; @@ -431,22 +431,22 @@ hash_bytes_extended(const unsigned char *k, int keylen, uint64 seed) break; case 7: b += ((uint32) k[6] << 8); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 16); - /* FALLTHROUGH */ + /* fall through */ case 5: b += ((uint32) k[4] << 24); - /* FALLTHROUGH */ + /* fall through */ case 4: a += ka[0]; break; case 3: a += ((uint32) k[2] << 8); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 16); - /* FALLTHROUGH */ + /* fall through */ case 1: a += ((uint32) k[0] << 24); /* case 0: nothing left to add */ @@ -456,13 +456,13 @@ hash_bytes_extended(const unsigned char *k, int keylen, uint64 seed) { case 11: c += ((uint32) k[10] << 24); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 8); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += ka[1]; @@ -470,22 +470,22 @@ hash_bytes_extended(const unsigned char *k, int keylen, uint64 seed) break; case 7: b += ((uint32) k[6] << 16); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 8); - /* FALLTHROUGH */ + /* fall through */ case 5: b += k[4]; - /* FALLTHROUGH */ + /* fall through */ case 4: a += ka[0]; break; case 3: a += ((uint32) k[2] << 16); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 8); - /* FALLTHROUGH */ + /* fall through */ case 1: a += k[0]; /* case 0: nothing left to add */ @@ -519,35 +519,35 @@ hash_bytes_extended(const unsigned char *k, int keylen, uint64 seed) { case 11: c += ((uint32) k[10] << 8); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 24); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += k[7]; - /* FALLTHROUGH */ + /* fall through */ case 7: b += ((uint32) k[6] << 8); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 16); - /* FALLTHROUGH */ + /* fall through */ case 5: b += ((uint32) k[4] << 24); - /* FALLTHROUGH */ + /* fall through */ case 4: a += k[3]; - /* FALLTHROUGH */ + /* fall through */ case 3: a += ((uint32) k[2] << 8); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 16); - /* FALLTHROUGH */ + /* fall through */ case 1: a += ((uint32) k[0] << 24); /* case 0: nothing left to add */ @@ -557,35 +557,35 @@ hash_bytes_extended(const unsigned char *k, int keylen, uint64 seed) { case 11: c += ((uint32) k[10] << 24); - /* FALLTHROUGH */ + /* fall through */ case 10: c += ((uint32) k[9] << 16); - /* FALLTHROUGH */ + /* fall through */ case 9: c += ((uint32) k[8] << 8); - /* FALLTHROUGH */ + /* fall through */ case 8: /* the lowest byte of c is reserved for the length */ b += ((uint32) k[7] << 24); - /* FALLTHROUGH */ + /* fall through */ case 7: b += ((uint32) k[6] << 16); - /* FALLTHROUGH */ + /* fall through */ case 6: b += ((uint32) k[5] << 8); - /* FALLTHROUGH */ + /* fall through */ case 5: b += k[4]; - /* FALLTHROUGH */ + /* fall through */ case 4: a += ((uint32) k[3] << 24); - /* FALLTHROUGH */ + /* fall through */ case 3: a += ((uint32) k[2] << 16); - /* FALLTHROUGH */ + /* fall through */ case 2: a += ((uint32) k[1] << 8); - /* FALLTHROUGH */ + /* fall through */ case 1: a += k[0]; /* case 0: nothing left to add */ |