summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-06-22 15:16:18 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-06-22 15:16:18 -0500
commit08a4699367cfad68c8ccefe28001ee1b8bef67da (patch)
tree44f5d741c09150dea2c9d45bcbcad47e2fc6ec87 /res
parentdab39a68132a9fa707b50f9fabb6324b29d7edbe (diff)
parentc982da0641f7cc43b9014fb47423ac7066ba4bdb (diff)
Merge "res_pjproject.c: Replace inlined DEBUG_ATLEAST() with macro." into 13
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 f54c3713e..08699f3ee 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;
}
}