From: Willy Tarreau <w@1wt.eu>
Date: Fri, 8 Oct 2021 13:55:13 +0000 (+0200)
Subject: BUILD: init: avoid a build warning on FreeBSD with USE_PROCCTL
X-Git-Tag: v2.5-dev9~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28345c66527cebb80d8639130566750a366a29a2;p=thirdparty%2Fhaproxy.git

BUILD: init: avoid a build warning on FreeBSD with USE_PROCCTL

It was brought by a variable declared after some statements in commit
21185970c ("MINOR: proc: setting the process to produce a core dump on
FreeBSD."). It's worth noting that some versions of clang seem to ignore
-Wdeclaration-after-statement by default. No backport is needed.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 5e4fe2b3d5..1ab2bf618a 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3384,10 +3384,12 @@ int main(int argc, char **argv)
 			ha_warning("[%s.main()] Failed to set the dumpable flag, "
 				   "no core will be dumped.\n", argv[0]);
 #elif defined(USE_PROCCTL)
-		int traceable = PROC_TRACE_CTL_ENABLE;
-		if (procctl(P_PID, getpid(), PROC_TRACE_CTL, &traceable) == -1)
-			ha_warning("[%s.main()] Failed to set the traceable flag, "
-				   "no core will be dumped.\n", argv[0]);
+		{
+			int traceable = PROC_TRACE_CTL_ENABLE;
+			if (procctl(P_PID, getpid(), PROC_TRACE_CTL, &traceable) == -1)
+				ha_warning("[%s.main()] Failed to set the traceable flag, "
+					   "no core will be dumped.\n", argv[0]);
+		}
 #endif
 	}