diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-05-13 15:31:14 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-05-13 15:31:14 -0400 |
| commit | 17cc133f017cb13737e23ce0da4415daf2c34cc3 (patch) | |
| tree | 45bd1e33f52902f315aa6364fd9fdf1ff152403a /src/backend/utils/adt/timestamp.c | |
| parent | 81ca8686305c4c62d723ab224ad5c414f350a3a0 (diff) | |
| download | postgresql-17cc133f017cb13737e23ce0da4415daf2c34cc3.tar.gz postgresql-17cc133f017cb13737e23ce0da4415daf2c34cc3.zip | |
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/backend/utils/adt/timestamp.c')
| -rw-r--r-- | src/backend/utils/adt/timestamp.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index d28d3c1628b..4caffb58040 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -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; |