debug: Move logging to callback to separate function

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/lib/util/debug.c b/lib/util/debug.c
index 9a4e5718112a53e044141759878cf23f5f07617e..e3725a953a19a15864de249145197f23459548fb 100644 (file)
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -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;
        }