diff options
| author | Anoop C S <anoopcs@redhat.com> | 2017-07-15 20:54:06 +0530 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2017-07-27 09:54:58 +0200 |
| commit | ceb17676cba178f56d00d21189c3f1765e5c2ae0 (patch) | |
| tree | c9a627a4a7b54388d63477d089043790d753399e /src | |
| parent | 908834465e11736796e418dfdee6425f71959590 (diff) | |
| download | socket_wrapper-ceb17676cba178f56d00d21189c3f1765e5c2ae0.tar.gz socket_wrapper-ceb17676cba178f56d00d21189c3f1765e5c2ae0.tar.xz socket_wrapper-ceb17676cba178f56d00d21189c3f1765e5c2ae0.zip | |
swrap: Suppress intentional fall through warning
-Wimplicit-fallthrough compiler flag introduced with gcc v7
results in the following warning during compilation:
[ 7%] Building C object src/CMakeFiles/socket_wrapper.dir/socket_wrapper.c.o
src/socket_wrapper.c: In function ‘sockaddr_convert_to_un’:
src/socket_wrapper.c:1846:18: warning: this statement may fall through [-Wimplicit-fallthrough=]
case AF_UNSPEC: {
^
/src/socket_wrapper.c:1866:2: note: here
case AF_INET:
^~~~
Default level for -Wimplicit-fallthrough(which is 3) allows
us to get rid of the above warning using specific comments
made within switch cases matching the regular expressions
outlined in gcc docs[1].
But for us the presence of preprocessor directives in the
vicinity of such comments nullifies its effect[2]. So our
best bet would be to make use of the reliable fallthrough
attribute and supress such warnings in future.
[1] https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-fallthrough
[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77817
Signed-off-by: Anoop C S <anoopcs@redhat.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/socket_wrapper.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 395d0d7..29cd3f9 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -107,6 +107,12 @@ enum swrap_dbglvl_e { #define DESTRUCTOR_ATTRIBUTE #endif +#ifdef HAVE_FALLTHROUGH_ATTRIBUTE +#define FALL_THROUGH __attribute__ ((fallthrough)) +#else +#define FALL_THROUGH +#endif + #ifdef HAVE_ADDRESS_SANITIZER_ATTRIBUTE #define DO_NOT_SANITIZE_ADDRESS_ATTRIBUTE __attribute__((no_sanitize_address)) #else @@ -587,7 +593,7 @@ static void *swrap_load_lib_handle(enum swrap_lib lib) switch (lib) { case SWRAP_LIBNSL: - /* FALL TROUGH */ + FALL_THROUGH; case SWRAP_LIBSOCKET: #ifdef HAVE_LIBSOCKET handle = swrap.libc.socket_handle; @@ -606,7 +612,7 @@ static void *swrap_load_lib_handle(enum swrap_lib lib) } break; #endif - /* FALL TROUGH */ + FALL_THROUGH; case SWRAP_LIBC: handle = swrap.libc.handle; #ifdef LIBC_SO @@ -1861,7 +1867,7 @@ static int sockaddr_convert_to_un(struct socket_info *si, * AF_UNSPEC is mapped to AF_INET and must be treated here. */ - /* FALL THROUGH */ + FALL_THROUGH; } case AF_INET: #ifdef HAVE_IPV6 @@ -2790,12 +2796,12 @@ static int swrap_socket(int family, int type, int protocol) if (real_type == SOCK_STREAM) { break; } - /*fall through*/ + FALL_THROUGH; case 17: if (real_type == SOCK_DGRAM) { break; } - /*fall through*/ + FALL_THROUGH; default: errno = EPROTONOSUPPORT; return -1; |