mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-29 23:39:35 +00:00 
			
		
		
		
	Merge "res_pjproject.c: Replace inlined DEBUG_ATLEAST() with macro."
This commit is contained in:
		| @@ -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; | ||||
| 		} | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user