]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: bug: make BUG_ON() void to avoid a rare warning
authorWilly Tarreau <w@1wt.eu>
Mon, 4 Sep 2023 14:42:53 +0000 (16:42 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 4 Sep 2023 17:38:51 +0000 (19:38 +0200)
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

index 6ce2066d59279d6b6fe48f85c3f10202f7563644..d34744869139a32ed9c0e86eb06606b22a0ce172 100644 (file)
@@ -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)                                          \