Commit ce38f96e951b1288a91a4fc3e5ba96607b44b4d5

Daniel Stone 2017-04-11T15:09:23

Add explicit fallthrough case statements When we fall through to another label in a case, add an explicit comment noting so, to quiet GCC 7's warnings. Signed-off-by: Daniel Stone <daniels@collabora.com>

diff --git a/src/compose/parser.c b/src/compose/parser.c
index fd2dca9..2ca1653 100644
--- a/src/compose/parser.c
+++ b/src/compose/parser.c
@@ -655,6 +655,7 @@ rhs:
         }
         production.keysym = keysym;
         production.has_keysym = true;
+	/* fallthrough */
     case TOK_END_OF_LINE:
         if (!production.has_string && !production.has_keysym) {
             scanner_warn(s, "right-hand side must have at least one of string or keysym; skipping line");
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index a85f460..8b15c1c 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -543,7 +543,7 @@ ExprResolveMaskLookup(struct xkb_context *ctx, const ExprDef *expr,
 
     case EXPR_ARRAY_REF:
         bogus = "array reference";
-
+	/* fallthrough */
     case EXPR_ACTION_DECL:
         if (bogus == NULL)
             bogus = "function use";