From 33e25f535f081072ec6c1752431540b0a4432554 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 14 Jul 2014 14:46:11 +0000 Subject: [PATCH] logger.h: Extract DEBUG_ATLEAST() to complement VERBOSITY_ATLEAST(). git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@418586 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/logger.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h index eda50351ca..3b02f46df8 100644 --- a/include/asterisk/logger.h +++ b/include/asterisk/logger.h @@ -378,15 +378,21 @@ void ast_callid_strnprint(char *buffer, size_t buffer_size, struct ast_callid *c #define ast_log_dynamic_level(level, ...) ast_log(level, __FILE__, __LINE__, __PRETTY_FUNCTION__, __VA_ARGS__) +#define DEBUG_ATLEAST(level) \ + (option_debug >= (level) \ + || (ast_opt_dbg_module && ast_debug_get_by_module(AST_MODULE) >= (level))) + /*! * \brief Log a DEBUG message * \param level The minimum value of option_debug for this message * to get logged */ -#define ast_debug(level, ...) do { \ - if (option_debug >= (level) || (ast_opt_dbg_module && ast_debug_get_by_module(AST_MODULE) >= (level)) ) \ - ast_log(AST_LOG_DEBUG, __VA_ARGS__); \ -} while (0) +#define ast_debug(level, ...) \ + do { \ + if (DEBUG_ATLEAST(level)) { \ + ast_log(AST_LOG_DEBUG, __VA_ARGS__); \ + } \ + } while (0) extern int ast_verb_sys_level; -- 2.47.2