ctdb-system: Replace ctdb_logging.h with common/logging.h

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c
index 141e89107b7eb3033cdbfc19913c280183f07be4..4c131060bfd56f5a64ab408947c0ca0c038e2607 100644 (file)
--- a/ctdb/common/system_aix.c
+++ b/ctdb/common/system_aix.c
@@ -26,7 +26,6 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include <netinet/if_ether.h>
@@ -36,6 +35,7 @@
 #include <sys/kinfo.h>
 #include <pcap.h>
 
+#include "common/logging.h"
 #include "common/system.h"
 
 

diff --git a/ctdb/common/system_common.c b/ctdb/common/system_common.c
index 9b12236be089b3042eec990cc3b5f7d6d7b5902e..9c8e9838d95f8214e4ac5212ce9966d5ec3ea756 100644 (file)
--- a/ctdb/common/system_common.c
+++ b/ctdb/common/system_common.c
@@ -23,9 +23,9 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
+#include "common/logging.h"
 #include "common/system.h"
 
 /*

diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c
index b8f3fbeab08fa262860082f2660bc202927cd2d8..97ac06c489aee5daa10bc699f012de817160b3f3 100644 (file)
--- a/ctdb/common/system_freebsd.c
+++ b/ctdb/common/system_freebsd.c
@@ -31,7 +31,6 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include <net/ethernet.h>
@@ -39,6 +38,7 @@
 #include <net/if_arp.h>
 #include <pcap.h>
 
+#include "common/logging.h"
 #include "common/system.h"
 
 #ifndef ETHERTYPE_IP6

diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c
index ec7986210bdbb274524441f3ec573c7d4ad0a86b..84c5dd6cd20130b731b034cf22d8a556bc70bdf9 100644 (file)
--- a/ctdb/common/system_gnu.c
+++ b/ctdb/common/system_gnu.c
@@ -30,7 +30,6 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include <net/ethernet.h>
@@ -38,6 +37,7 @@
 #include <net/if_arp.h>
 #include <pcap.h>
 
+#include "common/logging.h"
 #include "common/system.h"
 
 #ifndef ETHERTYPE_IP6

diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c
index cc478e8d9dc12b983f6e485d8354e79bae464d36..bd014109a5899e232c2e0dbe1d61259c3547edb4 100644 (file)
--- a/ctdb/common/system_kfreebsd.c
+++ b/ctdb/common/system_kfreebsd.c
@@ -30,7 +30,6 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include <net/ethernet.h>
@@ -38,6 +37,7 @@
 #include <net/if_arp.h>
 #include <pcap.h>
 
+#include "common/logging.h"
 #include "common/system.h"
 
 #ifndef ETHERTYPE_IP6

diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
index 1a36b1221c0fcea906f254809b110a1d8236eb9b..e7d9329ec5bdb4d44130d69fc3544bca7a8d1670 100644 (file)
--- a/ctdb/common/system_linux.c
+++ b/ctdb/common/system_linux.c
@@ -25,7 +25,6 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include <netinet/if_ether.h>
@@ -35,6 +34,7 @@
 #include <netpacket/packet.h>
 #include <sys/prctl.h>
 
+#include "common/logging.h"
 #include "common/system.h"
 
 #ifndef ETHERTYPE_IP6

diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index 91e2621e39c6d7632ed102bf03353ad2c16e52ba..81aa00bfc9dc5121fae28b25d86a8f57ea8c6445 100644 (file)
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -27,9 +27,9 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
+#include "common/logging.h"
 #include "common/system.h"
 
 #if HAVE_SCHED_H