From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 19 Jul 2022 09:53:46 +0000 (+0200)
Subject: BUILD: debug: Add braces to if statement calling only CHECK_IF()
X-Git-Tag: v2.7-dev3~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7ebe584d7;p=thirdparty%2Fhaproxy.git

BUILD: debug: Add braces to if statement calling only CHECK_IF()

In src/ev_epoll.c, a CHECK_IF() is guarded by an if statement. So, when the
macro is empty, GCC (at least 11.3.1) is not happy because there is an if
statement with an empty body without braces... It is handled by
"-Wempty-body" option.

So, braces are added and GCC is now happy.

No backport needed.
---

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 884c03837f..f35e1c29be 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -57,8 +57,9 @@ static void __fd_clo(int fd)
 		 * wrong thread or during startup, which is what we're checking
 		 * for. Regardless, it is not a problem to do so.
 		 */
-		if (unlikely(!(global.mode & MODE_STARTING)))
+		if (unlikely(!(global.mode & MODE_STARTING))) {
 			CHECK_IF(tgid != tgrp && !thread_isolated());
+		}
 
 		for (i = ha_tgroup_info[tgrp-1].base; i < ha_tgroup_info[tgrp-1].base + ha_tgroup_info[tgrp-1].count; i++)
 			if (m & ha_thread_info[i].ltid_bit)