sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

debug: Move mapping from level to syslog priority to helper function

Browse Source 
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Christof Schmitt 2015-01-09 13:29:48 -07:00
parent 1270813691
commit 364e8768d6
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/util/debug.c
View File

@ -102,6 +102,30 @@ static struct {
.fd = 2 /* stderr by default */
};
#ifdef WITH_SYSLOG
static int debug_level_to_priority(int level)
{
/*
* map debug levels to syslog() priorities note that not all
* DEBUG(0, ...) calls are necessarily errors
*/
static const int priority_map[4] = {
LOG_ERR, /* 0 */
LOG_WARNING, /* 1 */
LOG_NOTICE, /* 2 */
LOG_INFO, /* 3 */
};
int priority;
if( level >= ARRAY_SIZE(priority_map) || level < 0)
priority = LOG_DEBUG;
else
priority = priority_map[level];
return priority;
}
#endif
/* -------------------------------------------------------------------------- **
* External variables.
*/
@ -808,21 +832,7 @@ static int Debug1(const char *msg)
#ifdef WITH_SYSLOG
if( current_msg_level < state.settings.syslog ) {
/* map debug levels to syslog() priorities
* note that not all DEBUG(0, ...) calls are
* necessarily errors */
static const int priority_map[4] = {
LOG_ERR, /* 0 */
LOG_WARNING, /* 1 */
LOG_NOTICE, /* 2 */
LOG_INFO, /* 3 */
};
int priority;
if( current_msg_level >= ARRAY_SIZE(priority_map) || current_msg_level < 0)
priority = LOG_DEBUG;
else
priority = priority_map[current_msg_level];
int priority = debug_level_to_priority(current_msg_level);
/*
* Specify the facility to interoperate with other syslog