diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-11-11 15:17:56 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-16 00:46:14 +0100 |
| commit | 7258e1d9c9815e62129a34acf4bedfe54743ea18 (patch) | |
| tree | 9dafbe31af2c34793d3a0cac5d9569fc1870d357 /ctdb/client | |
| parent | 145da0b68fb668f53d79f3aa302120b26f2e5ba6 (diff) | |
| download | samba-7258e1d9c9815e62129a34acf4bedfe54743ea18.tar.gz | |
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>
Diffstat (limited to 'ctdb/client')
| -rw-r--r-- | ctdb/client/client_connect.c | 2 | ||||
| -rw-r--r-- | ctdb/client/client_control_sync.c | 3 | ||||
| -rw-r--r-- | ctdb/client/client_db.c | 3 | ||||
| -rw-r--r-- | ctdb/client/client_message_sync.c | 3 | ||||
| -rw-r--r-- | ctdb/client/client_util.c | 3 | ||||
| -rw-r--r-- | ctdb/client/ctdb_client.c | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/ctdb/client/client_connect.c b/ctdb/client/client_connect.c index 5f2b62e12cb..0c924855755 100644 --- 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 3f5ffb8df81..de52b4715ce 100644 --- 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 146c5e16938..6af607af09b 100644 --- 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 b6e53f3f88e..4bcc122ed7c 100644 --- 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 bb2dd6efb46..c4dbe04b9d5 100644 --- 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 f9686cca659..b9f9cf96775 100644 --- 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 |