logging: Move variable debug_extra from debug.*

debug_extra is CTDB-specific.  Moving it will help with the
transitions to Samba's updated debug.[ch].

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(Imported from commit 8b39141c46458974d5476b2925f2dd5d51d9180d)

diff --git a/common/ctdb_logging.c b/common/ctdb_logging.c
index bb80fcd27feb81af55b8b2e6581147d048f1f95a..cdb049c0d29c9b03085a3f9a78246e4fffe08ec4 100644 (file)
--- a/common/ctdb_logging.c
+++ b/common/ctdb_logging.c
@@ -25,6 +25,7 @@
 
 int LogLevel = DEBUG_NOTICE;
 int this_log_level = 0;
+const char *debug_extra = "";
 
 int log_ringbuf_size;
 

diff --git a/include/ctdb_logging.h b/include/ctdb_logging.h
index a3be3a84335966896586ba4ad03dc1267176429a..710864e8a1c874637b995dbeb3e690a15f07df98 100644 (file)
--- a/include/ctdb_logging.h
+++ b/include/ctdb_logging.h
@@ -22,6 +22,7 @@
 
 extern int LogLevel;
 extern int this_log_level;
+extern const char *debug_extra;
 
 enum debug_level {
        DEBUG_EMERG   = -3,

diff --git a/lib/util/debug.c b/lib/util/debug.c
index e9365d88f638f66fd909616436fd587a137530fd..40dda1a70a52c9a5bf00cb652d4432f40d5e2a65 100644 (file)
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -50,7 +50,6 @@ static void _do_debug_v(const char *format, va_list ap)
 
 /* default logging function */
 void (*do_debug_v)(const char *, va_list ap) = _do_debug_v;
-const char *debug_extra = "";
 
 void do_debug(const char *format, ...)
 {

diff --git a/lib/util/debug.h b/lib/util/debug.h
index 9b73b2640d435c5f70d280571257c040594d9117..f45301135855e9d8475292200bb1e6791aa719a3 100644 (file)
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -18,7 +18,6 @@
 */
 
 extern void (*do_debug_v)(const char *, va_list ap);
-extern const char *debug_extra;
 extern void (*do_debug_add_v)(const char *, va_list ap);
 void log_ringbuffer(const char *format, ...);
 void do_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);