From 8449f750e62cd229026e9df3bd023ec7e073a7d4 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Thu, 27 Apr 2017 16:57:18 +0300 Subject: [PATCH] Added missing "fall through" comments (ticket #1259). Found by gcc7 (-Wimplicit-fallthrough). --- src/core/ngx_murmurhash.c | 2 ++ src/http/ngx_http_parse.c | 3 +++ src/os/unix/ngx_process.c | 1 + 3 files changed, 6 insertions(+) diff --git a/src/core/ngx_murmurhash.c b/src/core/ngx_murmurhash.c index c31e0e035..5ade658dd 100644 --- a/src/core/ngx_murmurhash.c +++ b/src/core/ngx_murmurhash.c @@ -35,8 +35,10 @@ ngx_murmur_hash2(u_char *data, size_t len) switch (len) { case 3: h ^= data[2] << 16; + /* fall through */ case 2: h ^= data[1] << 8; + /* fall through */ case 1: h ^= data[0]; h *= 0x5bd1e995; diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c index 36220fdc1..e8e51563f 100644 --- a/src/http/ngx_http_parse.c +++ b/src/http/ngx_http_parse.c @@ -1396,6 +1396,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) goto done; case '+': r->plus_in_uri = 1; + /* fall through */ default: state = sw_usual; *u++ = ch; @@ -1437,6 +1438,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) goto done; case '+': r->plus_in_uri = 1; + /* fall through */ default: state = sw_usual; *u++ = ch; @@ -1484,6 +1486,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) goto done; case '+': r->plus_in_uri = 1; + /* fall through */ default: state = sw_usual; *u++ = ch; diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index dd50b5ca1..993c032ae 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -413,6 +413,7 @@ ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext) break; } ngx_debug_quit = 1; + /* fall through */ case ngx_signal_value(NGX_SHUTDOWN_SIGNAL): ngx_quit = 1; action = ", shutting down";