From: Amitay Isaacs <amitay@gmail.com>
Date: Wed, 11 Nov 2015 04:19:17 +0000 (+1100)
Subject: ctdb-common: Replace ctdb_logging.h with common/logging.h
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=3f314154fe0474cfe716e1d8e66e87ecf2404fe4;p=obnox%2Fsamba%2Fsamba-obnox.git

ctdb-common: 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/ctdb_io.c b/ctdb/common/ctdb_io.c
index 632574ed716..24968b3ac91 100644
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -31,11 +31,11 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
 #include "common/system.h"
+#include "common/logging.h"
 #include "common/common.h"
 
 #define QUEUE_BUFFER_SIZE	(16*1024)
diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 39775be706e..6c941d87e45 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -28,10 +28,10 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 /*
   find an attached ctdb_db handle given a name
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index 209735c7256..39108bcffb9 100644
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -27,12 +27,12 @@
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 /*
   return error string for last error
diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index 6b0982f5d75..1c602a730b7 100644
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -22,9 +22,9 @@
 #include <talloc.h>
 
 #include "lib/util/debug.h"
-#include "ctdb_logging.h"
 
-#include "rb_tree.h"
+#include "common/logging.h"
+#include "common/rb_tree.h"
 
 #define NO_MEMORY_FATAL(p) do { if (!(p)) { \
           DEBUG(DEBUG_CRIT,("Out of memory for %s at %s\n", #p, __location__)); \