From: Willy Tarreau <w@1wt.eu>
Date: Tue, 11 Aug 2026 06:58:20 +0000 (+0200)
Subject: MINOR: debug: pass the type to the __BUG_ON*() macros
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3927f32d982f39886c3c8e33440a181598b34699;p=thirdparty%2Fhaproxy.git

MINOR: debug: pass the type to the __BUG_ON*() macros

We now pass DBG_BUG or DBG_BUG_ONCE to the __BUG_ON*() macros, so that
we can later exploit this info to merge them.
---

diff --git a/include/haproxy/bug.h b/include/haproxy/bug.h
index c506ee7e0..dcfeea58b 100644
--- a/include/haproxy/bug.h
+++ b/include/haproxy/bug.h
@@ -405,11 +405,11 @@ extern __attribute__((__weak__)) struct debug_count __stop_dbg_cnt  HA_SECTION_S
 #define _BUG_ON(cond, file, line, details, ...)					\
 	(void)(unlikely(cond) ? ({						\
 		__DBG_COUNT(cond, file, line, DBG_BUG, __VA_ARGS__); 		\
-		__BUG_ON(cond, file, line, details, __VA_ARGS__);		\
+		__BUG_ON(cond, file, line, DBG_BUG, details, __VA_ARGS__); 	\
 		1; /* let's return the true condition */			\
 	}) : 0)
 
-#define __BUG_ON(cond, file, line, details, ...) do {			\
+#define __BUG_ON(cond, file, line, type, details, ...) do {		\
 		const char *msg;					\
 		if (sizeof("" __VA_ARGS__) > 1)				\
 			msg = "\"" #cond "\" matched at " file ":" #line "\x1e" __VA_ARGS__; \
@@ -430,11 +430,11 @@ extern __attribute__((__weak__)) struct debug_count __stop_dbg_cnt  HA_SECTION_S
 #define _BUG_ON_ONCE(cond, file, line, details, ...)				\
 	(void)(unlikely(cond) ? ({						\
 		__DBG_COUNT(cond, file, line, DBG_BUG_ONCE, __VA_ARGS__); 	\
-		__BUG_ON_ONCE(cond, file, line, details, __VA_ARGS__);		\
+		__BUG_ON_ONCE(cond, file, line, DBG_BUG_ONCE, details, __VA_ARGS__); \
 		1; /* let's return the true condition */			\
 	}) : 0)
 
-#define __BUG_ON_ONCE(cond, file, line, details, ...) do {		\
+#define __BUG_ON_ONCE(cond, file, line, type, details, ...) do {	\
 		static int __match_count_##line;			\
 		const char *msg;					\
 		if (sizeof("" __VA_ARGS__) > 1)				\