From 78d9f6f74e2999a2fd9bb205af00bc424e2cc3c6 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Thu, 17 Sep 2020 10:40:39 -0600 Subject: [PATCH] logger.h: Fix ast_trace to respect scope_level ast_trace() was always emitting messages when it's level was set to -1 because it was ignoring scope_level. Change-Id: I849c8f4f4613899c37f82be0202024e7d117e506 --- include/asterisk/logger.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h index 72c938d3de..6ab55f76da 100644 --- a/include/asterisk/logger.h +++ b/include/asterisk/logger.h @@ -663,7 +663,7 @@ void __attribute__((format (printf, 6, 7))) __ast_trace(const char *file, int li */ #define ast_trace_raw(level, indent_type, ...) \ ast_debug(level < 0 ? __scope_level : level, " " __VA_ARGS__); \ - if (TRACE_ATLEAST(level)) { \ + if (TRACE_ATLEAST(level < 0 ? __scope_level : level)) { \ __ast_trace(__FILE__, __LINE__, __PRETTY_FUNCTION__, indent_type, 0, " " __VA_ARGS__); \ } @@ -678,7 +678,7 @@ void __attribute__((format (printf, 6, 7))) __ast_trace(const char *file, int li */ #define ast_trace(level, ...) \ ast_debug(level < 0 ? __scope_level : level, " " __VA_ARGS__); \ - if (TRACE_ATLEAST(level)) { \ + if (TRACE_ATLEAST(level < 0 ? __scope_level : level)) { \ __ast_trace(__FILE__, __LINE__, __PRETTY_FUNCTION__, AST_TRACE_INDENT_SAME, 0, " " __VA_ARGS__); \ } -- 2.47.2