From a1e0d4a1e75fc6e6c3392a4e1d1d27005b38d6cc Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 2 Jan 2017 16:30:45 +0100 Subject: [PATCH] common: Turn assertions into expressions. * common/logging.h (log_assert): Turn this into an expression so it can be used in expressions. Signed-off-by: Justus Winter --- common/logging.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/logging.h b/common/logging.h index 64b999d66..fc9e8461b 100644 --- a/common/logging.h +++ b/common/logging.h @@ -56,18 +56,18 @@ estream_t log_get_stream (void); void _log_assert (const char *expr, const char *file, int line, const char *func) GPGRT_ATTR_NORETURN; # define BUG() bug_at( __FILE__ , __LINE__, __FUNCTION__) -# define log_assert(expr) do { \ - if (!(expr)) \ - _log_assert (#expr, __FILE__, __LINE__, __FUNCTION__); \ - } while (0) +# define log_assert(expr) \ + ((expr) \ + ? (void) 0 \ + : _log_assert (#expr, __FILE__, __LINE__, __FUNCTION__)) #else /*!GPGRT_HAVE_MACRO_FUNCTION*/ void bug_at (const char *file, int line); void _log_assert (const char *expr, const char *file, int line; # define BUG() bug_at( __FILE__ , __LINE__ ) -# define log_assert(expr) do { \ - if (!(expr)) \ - _log_assert (#expr, __FILE__, __LINE__); \ - } while (0) +# define log_assert(expr) \ + ((expr) \ + ? (void) 0 \ + : _log_assert (#expr, __FILE__, __LINE__)) #endif /*!GPGRT_HAVE_MACRO_FUNCTION*/ /* Flag values for log_set_prefix. */