move debug stuff from messages.c to debug.c (Elrond)

(This used to be commit 44df5a13bc83dc331caa6788cf0805333ed79f8d)

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index dc1a55fb581e6926fd1b718d6745273c4c1233e1..1b2f9ac350fd55a0a5b7e380518fb91c19cccc2a 100644 (file)
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -467,6 +467,24 @@ void debug_message_send(pid_t pid, const char *params_str)
 }
 
 
+/****************************************************************************
+ Return current debug level.
+****************************************************************************/
+
+static void debuglevel_message(int msg_type, pid_t src, void *buf, size_t len)
+{
+       char *debug_level_classes;
+       DEBUG(1,("INFO: Received REQ_DEBUGLEVEL message from PID %u\n",(unsigned int)src));
+
+       if ((debug_level_classes = debug_list_class_names_and_levels())) {
+       /*{ debug_level_classes = "test:1000";*/
+               message_send_pid(src, MSG_DEBUGLEVEL, debug_level_classes, strlen(debug_level_classes) + 1, True);
+               SAFE_FREE(debug_level_classes);
+       } else {
+               DEBUG(0, ("debuglevel_message: error retrieving class levels!\n"));
+       }
+}
+
 /****************************************************************************
 Init debugging (one time stuff)
 ****************************************************************************/
@@ -481,6 +499,7 @@ void debug_init(void)
        initialised = True;
 
        message_register(MSG_DEBUG, debug_message);
+       message_register(MSG_REQ_DEBUGLEVEL, debuglevel_message);
 
        for(p = default_classname_table; *p; p++)
        {

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 38d5e4af92e77b206d08610ff359881e320db12e..c06644bc861283f20029731b399166cb9d6577ba 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -79,31 +79,13 @@ static void sig_usr1(void)
  A useful function for testing the message system.
 ****************************************************************************/
 
-void ping_message(int msg_type, pid_t src, void *buf, size_t len)
+static void ping_message(int msg_type, pid_t src, void *buf, size_t len)
 {
        char *msg = buf ? buf : "none";
        DEBUG(1,("INFO: Received PING message from PID %u [%s]\n",(unsigned int)src, msg));
        message_send_pid(src, MSG_PONG, buf, len, True);
 }
 
-/****************************************************************************
- Return current debug level.
-****************************************************************************/
-
-void debuglevel_message(int msg_type, pid_t src, void *buf, size_t len)
-{
-       char *debug_level_classes;
-       DEBUG(1,("INFO: Received REQ_DEBUGLEVEL message from PID %u\n",(unsigned int)src));
-
-       if ((debug_level_classes = debug_list_class_names_and_levels())) {
-       /*{ debug_level_classes = "test:1000";*/
-               message_send_pid(src, MSG_DEBUGLEVEL, debug_level_classes, strlen(debug_level_classes) + 1, True);
-               SAFE_FREE(debug_level_classes);
-       } else {
-               DEBUG(0, ("debuglevel_message: error retrieving class levels!\n"));
-       }
-}
-
 /****************************************************************************
  Initialise the messaging functions. 
 ****************************************************************************/
@@ -124,7 +106,6 @@ BOOL message_init(void)
        CatchSignal(SIGUSR1, SIGNAL_CAST sig_usr1);
 
        message_register(MSG_PING, ping_message);
-       message_register(MSG_REQ_DEBUGLEVEL, debuglevel_message);
 
        return True;
 }