From 7ed0597ce893feccc8c2f0513a7a37d258239a93 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 14 Nov 2022 06:59:59 +0100 Subject: [PATCH] BUILD: sample: use __fallthrough in smp_is_rw() and smp_dup() This avoids three build warnings when preprocessing happens before compiling with gcc >= 7. --- include/haproxy/sample.h | 4 ++-- src/sample.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/haproxy/sample.h b/include/haproxy/sample.h index 9ec4df16d..14d1a0623 100644 --- a/include/haproxy/sample.h +++ b/include/haproxy/sample.h @@ -99,7 +99,7 @@ int smp_is_safe(struct sample *smp) case SMP_T_METH: if (smp->data.u.meth.meth != HTTP_METH_OTHER) return 1; - /* Fall through */ + __fallthrough; case SMP_T_STR: if (!smp->data.u.str.size || smp->data.u.str.data >= smp->data.u.str.size) @@ -149,7 +149,7 @@ int smp_is_rw(struct sample *smp) case SMP_T_METH: if (smp->data.u.meth.meth != HTTP_METH_OTHER) return 1; - /* Fall through */ + __fallthrough; case SMP_T_STR: if (!smp->data.u.str.size || diff --git a/src/sample.c b/src/sample.c index cd9fccf85..a3acfef14 100644 --- a/src/sample.c +++ b/src/sample.c @@ -823,7 +823,7 @@ int smp_dup(struct sample *smp) case SMP_T_METH: if (smp->data.u.meth.meth != HTTP_METH_OTHER) break; - /* Fall through */ + __fallthrough; case SMP_T_STR: trash = get_trash_chunk();