ctdb-client: 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/client/client_connect.c b/ctdb/client/client_connect.c
index 5f2b62e12cb8ceaff8a4d8240f4846fb2ad8b48e..0c924855755d574b28a00874bf929e631c7cab64 100644 (file)
--- a/ctdb/client/client_connect.c
+++ b/ctdb/client/client_connect.c
@@ -28,10 +28,10 @@
 #include "common/reqid.h"
 #include "common/srvid.h"
 #include "common/comm.h"
+#include "common/logging.h"
 
 #include "lib/util/tevent_unix.h"
 #include "lib/util/debug.h"
-#include "ctdb_logging.h"
 
 #include "protocol/protocol.h"
 #include "protocol/protocol_api.h"

diff --git a/ctdb/client/client_control_sync.c b/ctdb/client/client_control_sync.c
index 3f5ffb8df81405c212cdb711202dfb4f3c213770..de52b4715ce6624d205b6041a9cf26165f1d547a 100644 (file)
--- a/ctdb/client/client_control_sync.c
+++ b/ctdb/client/client_control_sync.c
@@ -25,8 +25,9 @@
 #include <tevent.h>
 #include <tdb.h>
 
+#include "common/logging.h"
+
 #include "lib/util/debug.h"
-#include "ctdb_logging.h"
 
 #include "protocol/protocol.h"
 #include "protocol/protocol_api.h"

diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c
index 146c5e1693840f488b3ddf37d60f834799b68c1a..6af607af09b696acba62bfd84cc132b5e673048d 100644 (file)
--- a/ctdb/client/client_db.c
+++ b/ctdb/client/client_db.c
@@ -25,11 +25,12 @@
 #include <tevent.h>
 #include <tdb.h>
 
+#include "common/logging.h"
+
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/tevent_unix.h"
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
-#include "ctdb_logging.h"
 
 #include "protocol/protocol.h"
 #include "protocol/protocol_api.h"

diff --git a/ctdb/client/client_message_sync.c b/ctdb/client/client_message_sync.c
index b6e53f3f88ebea1316baf680e75ed16895460625..4bcc122ed7cf449006cebd8b613d8affa58064fc 100644 (file)
--- a/ctdb/client/client_message_sync.c
+++ b/ctdb/client/client_message_sync.c
@@ -25,8 +25,9 @@
 #include <tevent.h>
 #include <tdb.h>
 
+#include "common/logging.h"
+
 #include "lib/util/debug.h"
-#include "ctdb_logging.h"
 
 #include "protocol/protocol.h"
 #include "protocol/protocol_api.h"

diff --git a/ctdb/client/client_util.c b/ctdb/client/client_util.c
index bb2dd6efb4625c558c6f6ec6358494ecb973c556..c4dbe04b9d55a9736ef248bb0e392c7f769a7787 100644 (file)
--- a/ctdb/client/client_util.c
+++ b/ctdb/client/client_util.c
@@ -25,8 +25,9 @@
 #include <tevent.h>
 #include <tdb.h>
 
+#include "common/logging.h"
+
 #include "lib/util/debug.h"
-#include "ctdb_logging.h"
 
 #include "protocol/protocol.h"
 #include "protocol/protocol_api.h"

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index f9686cca659236f4f6bb677b31357be93c40bf43..b9f9cf9677584503d443475c5b2807f176edef65 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -35,13 +35,13 @@
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 /*
   allocate a packet for use in client<->daemon communication