diff options
author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-05-12 16:01:52 -0400 |
---|---|---|
committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-05-12 16:07:30 -0400 |
commit | 3e9744465dbe51822c7d76baca1f934d54ba9452 (patch) | |
tree | 08526408599e7a83c122462413f793c0531576f4 /src/backend/utils/adt/timestamp.c | |
parent | 6a918c3ac8a6b1d8b53cead6fcb7cbd84eee5750 (diff) | |
download | postgresql-3e9744465dbe51822c7d76baca1f934d54ba9452.tar.gz postgresql-3e9744465dbe51822c7d76baca1f934d54ba9452.zip |
Add -Wimplicit-fallthrough to CFLAGS and CXXFLAGS
Use it at level 4, a bit more restrictive than the default level, and
tweak our commanding comments to FALLTHROUGH.
(However, leave zic.c alone, since it's external code; to avoid the
warnings that would appear there, change CFLAGS for that file in the
Makefile.)
Author: Julien Rouhaud <rjuju123@gmail.com>
Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/20200412081825.qyo5vwwco3fv4gdo@nol
Discussion: https://postgr.es/m/flat/E1fDenm-0000C8-IJ@gemulon.postgresql.org
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 4caffb58040..d28d3c1628b 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; - /* FALL THRU */ + /* FALLTHROUGH */ 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; - /* FALL THRU */ + /* FALLTHROUGH */ 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; } - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_YEAR: tm->tm_mon = 1; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_QUARTER: tm->tm_mon = (3 * ((tm->tm_mon - 1) / 3)) + 1; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_MONTH: tm->tm_mday = 1; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_DAY: tm->tm_hour = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_HOUR: tm->tm_min = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_MINUTE: tm->tm_sec = 0; - /* FALL THRU */ + /* FALLTHROUGH */ 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; - /* FALL THRU */ + /* FALLTHROUGH */ 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; - /* FALL THRU */ + /* FALLTHROUGH */ 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; } - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_YEAR: tm->tm_mon = 1; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_QUARTER: tm->tm_mon = (3 * ((tm->tm_mon - 1) / 3)) + 1; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_MONTH: tm->tm_mday = 1; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_DAY: tm->tm_hour = 0; redotz = true; /* for all cases >= DAY */ - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_HOUR: tm->tm_min = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_MINUTE: tm->tm_sec = 0; - /* FALL THRU */ + /* FALLTHROUGH */ 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; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_CENTURY: /* caution: C division may have negative remainder */ tm->tm_year = (tm->tm_year / 100) * 100; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_DECADE: /* caution: C division may have negative remainder */ tm->tm_year = (tm->tm_year / 10) * 10; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_YEAR: tm->tm_mon = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_QUARTER: tm->tm_mon = 3 * (tm->tm_mon / 3); - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_MONTH: tm->tm_mday = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_DAY: tm->tm_hour = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_HOUR: tm->tm_min = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_MINUTE: tm->tm_sec = 0; - /* FALL THRU */ + /* FALLTHROUGH */ case DTK_SECOND: fsec = 0; break; |