sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

debug: Move logging to callback to separate 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:17:49 -07:00
parent 17bd9b7349
commit 1270813691
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/util/debug.c
View File

@ -546,6 +546,20 @@ void debug_set_callback(void *private_ptr, debug_callback_fn fn)
}
}
static void debug_callback_log(const char *msg, int msg_level)
{
size_t msg_len = strlen(msg);
char msg_copy[msg_len];
if ((msg_len > 0) && (msg[msg_len-1] == '\n')) {
memcpy(msg_copy, msg, msg_len-1);
msg_copy[msg_len-1] = '\0';
msg = msg_copy;
}
state.callback(state.callback_private, msg_level, msg);
}
/**************************************************************************
reopen the log files
note that we now do this unconditionally
@ -764,16 +778,7 @@ static int Debug1(const char *msg)
debug_count++;
if (state.logtype == DEBUG_CALLBACK) {
size_t msg_len = strlen(msg);
char msg_copy[msg_len];
if ((msg_len > 0) && (msg[msg_len-1] == '\n')) {
memcpy(msg_copy, msg, msg_len-1);
msg_copy[msg_len-1] = '\0';
msg = msg_copy;
}
state.callback(state.callback_private, current_msg_level, msg);
debug_callback_log(msg, current_msg_level);
goto done;
}