After reading Russell's e-mail to the dev list stating that checking option_verbose is not

equivalent to the check done by ast_verb, I wrote a macro, VERBOSITY_LEVEL, which does this
check. I did a quick look in the source and used this macro in some places where option_verbose
was used.

I also converted some verbose messages in logger.c to use ast_verb instead of ast_verbose.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-12-14 18:47:44 +00:00
parent f5a9e958d1
commit 4f75e15665
5 changed files with 8 additions and 8 deletions

View File

@@ -154,8 +154,10 @@ unsigned int ast_verbose_get_by_file(const char *file);
ast_log(LOG_DEBUG, __VA_ARGS__); \
} while (0)
#define VERBOSITY_LEVEL(level) (option_verbose >= (level) || (ast_opt_verb_file && ast_verbose_get_by_file(__FILE__) >= (level)))
#define ast_verb(level, ...) do { \
if (option_verbose >= (level) || (ast_opt_verb_file && ast_verbose_get_by_file(__FILE__) >= (level)) ) { \
if (VERBOSITY_LEVEL((level)) ) { \
if (level >= 4) \
ast_verbose(VERBOSE_PREFIX_4 __VA_ARGS__); \
else if (level == 3) \