[lxc-devel] [lxc/master] autotools: add -Wimplicit-fallthrough
brauner on Github
lxc-bot at linuxcontainers.org
Fri Sep 21 13:00:50 UTC 2018
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180921/5a9f1d0a/attachment.bin>
-------------- next part --------------
From 0796f26b888b20423efb47b5cd6836dca45f6b40 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Fri, 21 Sep 2018 14:54:06 +0200
Subject: [PATCH] autotools: add -Wimplicit-fallthrough
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
config/ax_check_compile_flag.m4 | 53 +++++++++++++++++++++++++++++++++
configure.ac | 3 ++
src/lxc/attach.c | 2 ++
src/lxc/cmd/lxc_init.c | 2 ++
src/lxc/compiler.h | 6 ++++
src/lxc/tools/arguments.c | 4 +++
6 files changed, 70 insertions(+)
create mode 100644 config/ax_check_compile_flag.m4
diff --git a/config/ax_check_compile_flag.m4 b/config/ax_check_compile_flag.m4
new file mode 100644
index 000000000..bd753b34d
--- /dev/null
+++ b/config/ax_check_compile_flag.m4
@@ -0,0 +1,53 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+# Check whether the given FLAG works with the current language's compiler
+# or gives an error. (Warnings, however, are ignored)
+#
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+# success/failure.
+#
+# If EXTRA-FLAGS is defined, it is added to the current language's default
+# flags (e.g. CFLAGS) when the check is done. The check is thus made with
+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
+# force the compiler to issue an error when a bad flag is given.
+#
+# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Guido U. Draheim <guidod at gmx.de>
+# Copyright (c) 2011 Maarten Bosmans <mkbosmans at gmail.com>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 6
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+ [AS_VAR_SET(CACHEVAR,[yes])],
+ [AS_VAR_SET(CACHEVAR,[no])])
+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+ [m4_default([$2], :)],
+ [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/configure.ac b/configure.ac
index 92d6601d7..542885767 100644
--- a/configure.ac
+++ b/configure.ac
@@ -683,6 +683,9 @@ AC_PROG_SED
# See if we support thread-local storage.
LXC_CHECK_TLS
+AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="$CFLAGS -fdiagnostics-color"],,[-Werror])
+AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="$CFLAGS -Wimplicit-fallthrough"],,[-Werror])
+
CFLAGS="$CFLAGS -Wvla -std=gnu11"
if test "x$enable_werror" = "xyes"; then
CFLAGS="$CFLAGS -Werror"
diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index e109c4640..4c01dea18 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -1520,8 +1520,10 @@ int lxc_attach_run_command(void *payload)
switch (errno) {
case ENOEXEC:
ret = 126;
+ break;
case ENOENT:
ret = 127;
+ break;
}
}
diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c
index 362f5b495..160c054a5 100644
--- a/src/lxc/cmd/lxc_init.c
+++ b/src/lxc/cmd/lxc_init.c
@@ -532,8 +532,10 @@ static int arguments_parse(struct arguments *args, int argc,
break;
case OPT_USAGE:
print_usage(args->options);
+ break;
case OPT_VERSION:
print_version();
+ break;
case '?':
print_help();
exit(EXIT_FAILURE);
diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h
index cda44c987..0d50e4868 100644
--- a/src/lxc/compiler.h
+++ b/src/lxc/compiler.h
@@ -32,4 +32,10 @@
#endif
#endif
+#if defined(__GNUC__) && __GNUC__ >= 7 || defined(__clang__)
+#define __fallthrough__ __attribute__((fallthrough))
+#else
+#define __fallthrough__
+#endif
+
#endif /* __LXC_COMPILER_H */
diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c
index f6ee123dc..d84db56f5 100644
--- a/src/lxc/tools/arguments.c
+++ b/src/lxc/tools/arguments.c
@@ -239,12 +239,16 @@ extern int lxc_arguments_parse(struct lxc_arguments *args, int argc,
break;
case OPT_USAGE:
print_usage_exit(args->options, args);
+ break;
case OPT_VERSION:
print_version_exit();
+ break;
case '?':
print_help_exit(args, 1);
+ break;
case 'h':
print_help_exit(args, 0);
+ break;
default:
if (args->parser) {
ret = args->parser(args, c, optarg);
More information about the lxc-devel
mailing list