From: Willy Tarreau <w@1wt.eu>
Date: Mon, 14 Nov 2022 06:22:57 +0000 (+0100)
Subject: BUILD: logs: use __fallthrough in build_log_header()
X-Git-Tag: v2.7-dev9~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80f9a63184f185f435dd72f5c5ffb9f8a0ff8ee5;p=thirdparty%2Fhaproxy.git

BUILD: logs: use __fallthrough in build_log_header()

This avoids 4 build warnings when preprocessing happens before compiling
with gcc >= 7.
---

diff --git a/src/log.c b/src/log.c
index 5be654c9fb..1fdcd81595 100644
--- a/src/log.c
+++ b/src/log.c
@@ -627,7 +627,7 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 					cformat = LF_SEPARATOR;
 					break;
 				}
-				/* fall through */
+				__fallthrough;
 			default : cformat = LF_TEXT;      break;
 			}
 		}
@@ -1383,7 +1383,7 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility,
 		case LOG_FORMAT_PRIO:
 			fac_level = facility << 3;
 			/* further format ignore the facility */
-			/* fall through */
+			__fallthrough;
 		case LOG_FORMAT_TIMED:
 		case LOG_FORMAT_SHORT:
 			fac_level += level;
@@ -1476,7 +1476,7 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility,
 				break;
 			}
 			/* let continue as 'timed' and 'iso' format for usual timestamp */
-			/* fall through */
+			__fallthrough;
 		case LOG_FORMAT_TIMED:
 		case LOG_FORMAT_ISO:
 			/* ISO format ex: '1900:01:01T12:00:00.123456Z'
@@ -1550,7 +1550,7 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility,
 			}
 			else /* the caller MUST fill the hostname, this field is mandatory */
 				hdr_ctx.ist_vector[(*nbelem)++] = ist2("localhost ", 10);
-			/* fall through */
+			__fallthrough;
 		case LOG_FORMAT_LOCAL:
 			if (!metadata || !metadata[LOG_META_TAG].len)
 				break;