r25626: Move some debug-specific prototypes to debug.h.

diff --git a/source/lib/util/debug.h b/source/lib/util/debug.h
index 4fa2e9f598a76e42fdf30e55a41209490254ca4a..25b28b65e9acb653f432a1a554a5b73acb2d7f75 100644 (file)
--- a/source/lib/util/debug.h
+++ b/source/lib/util/debug.h
@@ -68,3 +68,57 @@ extern int DEBUGLEVEL;
 
 /** Possible destinations for the debug log */
 enum debug_logtype {DEBUG_STDOUT = 0, DEBUG_FILE = 1, DEBUG_STDERR = 2};
+
+/**
+  the backend for debug messages. Note that the DEBUG() macro has already
+  ensured that the log level has been met before this is called
+*/
+_PUBLIC_ void do_debug_header(int level, const char *location, const char *func);
+
+/**
+  reopen the log file (usually called because the log file name might have changed)
+*/
+_PUBLIC_ void reopen_logs(void);
+
+/** 
+ * this global variable determines what messages are printed 
+ */
+_PUBLIC_ void debug_schedule_reopen_logs(void);
+
+/**
+  control the name of the logfile and whether logging will be to stdout, stderr
+  or a file
+*/
+_PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtype);
+
+/**
+  return a string constant containing n tabs
+  no more than 10 tabs are returned
+*/
+_PUBLIC_ const char *do_debug_tab(int n);
+
+/**
+  log suspicious usage - print comments and backtrace
+*/     
+_PUBLIC_ void log_suspicious_usage(const char *from, const char *info);
+
+/**
+  print suspicious usage - print comments and backtrace
+*/     
+_PUBLIC_ void print_suspicious_usage(const char* from, const char* info);
+_PUBLIC_ uint32_t get_task_id(void);
+_PUBLIC_ void log_task_id(void);
+
+/**
+  register a set of debug handlers. 
+*/
+_PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops);
+
+/**
+  the backend for debug messages. Note that the DEBUG() macro has already
+  ensured that the log level has been met before this is called
+
+  @note You should never have to call this function directly. Call the DEBUG()
+  macro instead.
+*/
+_PUBLIC_ void do_debug(const char *format, ...) _PRINTF_ATTRIBUTE(1,2);

diff --git a/source/lib/util/fault.c b/source/lib/util/fault.c
index e9cd040ee6eb7ff5e3ef946c8a7d5696df2ab547..cd347a5ef9f3f423d3eddeaa2c41aa8cb0240172 100644 (file)
--- a/source/lib/util/fault.c
+++ b/source/lib/util/fault.c
@@ -208,7 +208,8 @@ _PUBLIC_ void fault_setup(const char *pname)
   register a fault handler. 
   Should only be called once in the execution of smbd.
 */
-_PUBLIC_ bool register_fault_handler(const char *name, void (*fault_handler)(int sig))
+_PUBLIC_ bool register_fault_handler(const char *name, 
+                                    void (*fault_handler)(int sig))
 {
        if (fault_handlers.name != NULL) {
                /* it's already registered! */

diff --git a/source/lib/util/util.h b/source/lib/util/util.h
index 71880c1c1a59a77fcf79947b6d00058bcf25e20e..ca11bdfef9fd8717604f46661af48b26b3378744 100644 (file)
--- a/source/lib/util/util.h
+++ b/source/lib/util/util.h
@@ -146,61 +146,6 @@ extern const char *panic_action;
 #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((const char *)(p1)) - (const char *)(p2)))
 #endif
 
-
-/** 
- * this global variable determines what messages are printed 
- */
-_PUBLIC_ void debug_schedule_reopen_logs(void);
-
-/**
-  the backend for debug messages. Note that the DEBUG() macro has already
-  ensured that the log level has been met before this is called
-*/
-_PUBLIC_ void do_debug_header(int level, const char *location, const char *func);
-
-/**
-  the backend for debug messages. Note that the DEBUG() macro has already
-  ensured that the log level has been met before this is called
-
-  @note You should never have to call this function directly. Call the DEBUG()
-  macro instead.
-*/
-_PUBLIC_ void do_debug(const char *format, ...) PRINTF_ATTRIBUTE(1,2);
-
-/**
-  reopen the log file (usually called because the log file name might have changed)
-*/
-_PUBLIC_ void reopen_logs(void);
-
-/**
-  control the name of the logfile and whether logging will be to stdout, stderr
-  or a file
-*/
-_PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtype);
-
-/**
-  return a string constant containing n tabs
-  no more than 10 tabs are returned
-*/
-_PUBLIC_ const char *do_debug_tab(int n);
-
-/**
-  log suspicious usage - print comments and backtrace
-*/     
-_PUBLIC_ void log_suspicious_usage(const char *from, const char *info);
-
-/**
-  print suspicious usage - print comments and backtrace
-*/     
-_PUBLIC_ void print_suspicious_usage(const char* from, const char* info);
-_PUBLIC_ uint32_t get_task_id(void);
-_PUBLIC_ void log_task_id(void);
-
-/**
-  register a set of debug handlers. 
-*/
-_PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops);
-
 /* The following definitions come from lib/util/fault.c  */