From 17a7baca070f700ffa05ee8245648e88f921386b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 4 Sep 2023 16:42:53 +0200 Subject: [PATCH] BUILD: bug: make BUG_ON() void to avoid a rare warning When building without threads, the recently introduced BUG_ON(tid != 0) turns to a constant expression that evaluates to 0 and that is not used, resulting in this warning: src/connection.c: In function 'conn_free': src/connection.c:584:3: warning: statement with no effect [-Wunused-value] This is because the whole thing is declared as an expression for clarity. Make it return void to avoid this. No backport is needed. --- include/haproxy/bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/haproxy/bug.h b/include/haproxy/bug.h index 6ce2066d5..d34744869 100644 --- a/include/haproxy/bug.h +++ b/include/haproxy/bug.h @@ -103,7 +103,7 @@ static inline __attribute((always_inline)) void ha_crash_now(void) __BUG_ON(cond, file, line, crash, pfx, sfx) #define __BUG_ON(cond, file, line, crash, pfx, sfx) \ - (unlikely(cond) ? ({ \ + (void)(unlikely(cond) ? ({ \ complain(NULL, "\n" pfx "condition \"" #cond "\" matched at " file ":" #line "" sfx "\n", crash); \ if (crash & 1) \ ABORT_NOW(); \ @@ -121,7 +121,7 @@ static inline __attribute((always_inline)) void ha_crash_now(void) __BUG_ON_ONCE(cond, file, line, crash, pfx, sfx) #define __BUG_ON_ONCE(cond, file, line, crash, pfx, sfx) \ - (unlikely(cond) ? ({ \ + (void)(unlikely(cond) ? ({ \ static int __match_count_##line; \ complain(&__match_count_##line, "\n" pfx "condition \"" #cond "\" matched at " file ":" #line "" sfx "\n", crash); \ if (crash & 1) \