database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +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

54
src/backend/utils/adt/timestamp.c
View File

@ -3866,14 +3866,14 @@ timestamp_trunc(PG_FUNCTION_ARGS)
tm->tm_year = ((tm->tm_year + 999) / 1000) * 1000 - 999;
else
tm->tm_year = -((999 - (tm->tm_year - 1)) / 1000) * 1000 + 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_CENTURY:
/* see comments in timestamptz_trunc */
if (tm->tm_year > 0)
tm->tm_year = ((tm->tm_year + 99) / 100) * 100 - 99;
else
tm->tm_year = -((99 - (tm->tm_year - 1)) / 100) * 100 + 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_DECADE:
/* see comments in timestamptz_trunc */
if (val != DTK_MILLENNIUM && val != DTK_CENTURY)
@ -3883,25 +3883,25 @@ timestamp_trunc(PG_FUNCTION_ARGS)
else
tm->tm_year = -((8 - (tm->tm_year - 1)) / 10) * 10;
}
/* FALLTHROUGH */
/* FALL THRU */
case DTK_YEAR:
tm->tm_mon = 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_QUARTER:
tm->tm_mon = (3 * ((tm->tm_mon - 1) / 3)) + 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_MONTH:
tm->tm_mday = 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_DAY:
tm->tm_hour = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_HOUR:
tm->tm_min = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_MINUTE:
tm->tm_sec = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_SECOND:
fsec = 0;
break;
@ -4007,14 +4007,14 @@ timestamptz_trunc_internal(text *units, TimestampTz timestamp, pg_tz *tzp)
tm->tm_year = ((tm->tm_year + 999) / 1000) * 1000 - 999;
else
tm->tm_year = -((999 - (tm->tm_year - 1)) / 1000) * 1000 + 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_CENTURY:
/* truncating to the century? as above: -100, 1, 101... */
if (tm->tm_year > 0)
tm->tm_year = ((tm->tm_year + 99) / 100) * 100 - 99;
else
tm->tm_year = -((99 - (tm->tm_year - 1)) / 100) * 100 + 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_DECADE:
/*
@ -4028,26 +4028,26 @@ timestamptz_trunc_internal(text *units, TimestampTz timestamp, pg_tz *tzp)
else
tm->tm_year = -((8 - (tm->tm_year - 1)) / 10) * 10;
}
/* FALLTHROUGH */
/* FALL THRU */
case DTK_YEAR:
tm->tm_mon = 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_QUARTER:
tm->tm_mon = (3 * ((tm->tm_mon - 1) / 3)) + 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_MONTH:
tm->tm_mday = 1;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_DAY:
tm->tm_hour = 0;
redotz = true; /* for all cases >= DAY */
/* FALLTHROUGH */
/* FALL THRU */
case DTK_HOUR:
tm->tm_min = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_MINUTE:
tm->tm_sec = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_SECOND:
fsec = 0;
break;
@ -4195,33 +4195,33 @@ interval_trunc(PG_FUNCTION_ARGS)
case DTK_MILLENNIUM:
/* caution: C division may have negative remainder */
tm->tm_year = (tm->tm_year / 1000) * 1000;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_CENTURY:
/* caution: C division may have negative remainder */
tm->tm_year = (tm->tm_year / 100) * 100;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_DECADE:
/* caution: C division may have negative remainder */
tm->tm_year = (tm->tm_year / 10) * 10;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_YEAR:
tm->tm_mon = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_QUARTER:
tm->tm_mon = 3 * (tm->tm_mon / 3);
/* FALLTHROUGH */
/* FALL THRU */
case DTK_MONTH:
tm->tm_mday = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_DAY:
tm->tm_hour = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_HOUR:
tm->tm_min = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_MINUTE:
tm->tm_sec = 0;
/* FALLTHROUGH */
/* FALL THRU */
case DTK_SECOND:
fsec = 0;
break;