diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-01-27 00:50:10 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-06-16 17:04:25 -0400 |
| commit | ffabccd576d915fedee39842cade1be2d87fe1ff (patch) | |
| tree | 1c15adccbb2753f60c755493422c40ce3d184d27 /src/core | |
| parent | 7df76ac2d5b9925f61dd0260c333f7fa07b18f33 (diff) | |
tree-wide: adjust fall through comments so that gcc is happy
gcc 7 adds -Wimplicit-fallthrough=3 to -Wextra. There are a few ways
we could deal with that. After we take into account the need to stay compatible
with older versions of the compiler (and other compilers), I don't think adding
__attribute__((fallthrough)), even as a macro, is worth the trouble. It sticks
out too much, a comment is just as good. But gcc has some very specific
requiremnts how the comment should look. Adjust it the specific form that it
likes. I don't think the extra stuff we had in those comments was adding much
value.
(Note: the documentation seems to be wrong, and seems to describe a different
pattern from the one that is actually used. I guess either the docs or the code
will have to change before gcc 7 is finalized.)
(cherry picked from commit ec251fe7d5bc24b5d38b0853bc5969f3a0ba06e2)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/socket.c | 1 | ||||
| -rw-r--r-- | src/core/timer.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 0b1c4acfec..9a2c3a7df7 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2654,6 +2654,7 @@ const char* socket_port_type_to_string(SocketPort *p) { if (socket_address_family(&p->address) == AF_NETLINK) return "Netlink"; + /* fall through */ default: return NULL; } diff --git a/src/core/timer.c b/src/core/timer.c index 2469a517ea..9682ac1ae4 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -422,7 +422,8 @@ static void timer_enter_waiting(Timer *t, bool initial) { } /* In a container we don't want to include the time the host * was already up when the container started, so count from - * our own startup. Fall through. */ + * our own startup. */ + /* fall through */ case TIMER_STARTUP: base = UNIT(t)->manager->userspace_timestamp.monotonic; break; |