summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-06-22 14:36:46 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-06-22 14:36:46 -0500
commitdf6f69ceb616d5b95f208f21b9a31f48bcee2e7e (patch)
treee964ba9e132e9989bacde2a8a445a1c86e152a26 /res
parent3b4f5d1345a1bf143136b5523ea39e6397910fdd (diff)
parentf572b264958eef821234215bba50933b2e740aef (diff)
Merge "res_pjproject.c: Replace inlined DEBUG_ATLEAST() with macro."
Diffstat (limited to 'res')
-rw-r--r--res/res_pjproject.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/res/res_pjproject.c b/res/res_pjproject.c
index 9ed3d57a1..151c99603 100644
--- a/res/res_pjproject.c
+++ b/res/res_pjproject.c
@@ -177,7 +177,6 @@ static void log_forwarder(int level, const char *data, int len)
const char * log_source = "pjproject";
int log_line = 0;
const char *log_func = "<?>";
- int mod_level;
if (pjproject_log_intercept.fd != -1
&& pjproject_log_intercept.thread == pthread_self()) {
@@ -196,10 +195,8 @@ static void log_forwarder(int level, const char *data, int len)
}
if (ast_level == __LOG_DEBUG) {
- /* For levels 3 and up, obey the debug level for res_pjproject */
- mod_level = ast_opt_dbg_module ?
- ast_debug_get_by_module("res_pjproject") : 0;
- if (option_debug < level && mod_level < level) {
+ /* Obey the debug level for res_pjproject */
+ if (!DEBUG_ATLEAST(level)) {
return;
}
}