database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-07 12:02:30 +03:00
Code Activity

Dial back -Wimplicit-fallthrough to level 3

Browse Source 
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
This commit is contained in:
Alvaro Herrera
2020-05-13 15:31:14 -04:00
parent 81ca868630
commit 17cc133f01
34 changed files with 194 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/common/hashfn.c
View File

@@ -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 */

6
src/common/wchar.c
View File

@@ -1452,12 +1452,12 @@ pg_utf8_islegal(const unsigned char *source, int length)
a = source[3];
if (a < 0x80 || a > 0xBF)
return false;
/* FALLTHROUGH */
/* FALL THRU */
case 3:
a = source[2];
if (a < 0x80 || a > 0xBF)
return false;
/* FALLTHROUGH */
/* FALL THRU */
case 2:
a = source[1];
switch (*source)
@@ -1483,7 +1483,7 @@ pg_utf8_islegal(const unsigned char *source, int length)
return false;
break;
}
/* FALLTHROUGH */
/* FALL THRU */
case 1:
a = *source;
if (a >= 0x80 && a < 0xC2)