From: Michael Brown Date: Wed, 22 Mar 2017 06:19:33 +0000 (+0200) Subject: [build] Avoid confusing sparse in single-argument DBG() macros X-Git-Tag: v1.20.1~268 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e88e2a29657824963c4fdb948e5ac99dfe6472ee;p=thirdparty%2Fipxe.git [build] Avoid confusing sparse in single-argument DBG() macros For visual consistency with surrounding lines, the definitions of DBG_MORE(), DBG_PAUSE(), etc include an unnecessary ##__VA_ARGS__ argument which is always elided. This confuses sparse, which complains about DBG_MORE_IF() being called with more than one argument. Work around this problem by adding an unused variable argument list to the single-argument macros DBG_MORE_IF() and DBG_PAUSE_IF(). Signed-off-by: Michael Brown --- diff --git a/src/include/compiler.h b/src/include/compiler.h index 56a5f63d5..a936425de 100644 --- a/src/include/compiler.h +++ b/src/include/compiler.h @@ -403,7 +403,7 @@ char __debug_disable(OBJECT) = ( DBGLVL_MAX & ~DBGLVL_DFLT ); * * @v level Debug level */ -#define DBG_PAUSE_IF( level ) do { \ +#define DBG_PAUSE_IF( level, ... ) do { \ if ( DBG_ ## level ) { \ dbg_pause(); \ } \ @@ -414,7 +414,7 @@ char __debug_disable(OBJECT) = ( DBGLVL_MAX & ~DBGLVL_DFLT ); * * @v level Debug level */ -#define DBG_MORE_IF( level ) do { \ +#define DBG_MORE_IF( level, ... ) do { \ if ( DBG_ ## level ) { \ dbg_more(); \ } \