From 3e5f29bddfd83914eeec706367b2b1bd30aba31e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 24 Jan 2007 04:34:19 +0000 Subject: [PATCH] r20991: use relative includes for ctdb headers. This works with both standalone and built-in ctdb --- source/cluster/ctdb/brlock_ctdb.c | 2 +- source/cluster/ctdb/common/ctdb.c | 2 +- source/cluster/ctdb/common/ctdb_call.c | 2 +- source/cluster/ctdb/common/ctdb_ltdb.c | 2 +- source/cluster/ctdb/common/ctdb_util.c | 3 +-- source/cluster/ctdb/ctdb_cluster.c | 2 +- source/cluster/ctdb/tcp/tcp_connect.c | 2 +- source/cluster/ctdb/tcp/tcp_init.c | 2 +- source/cluster/ctdb/tcp/tcp_io.c | 9 +-------- 9 files changed, 9 insertions(+), 17 deletions(-) diff --git a/source/cluster/ctdb/brlock_ctdb.c b/source/cluster/ctdb/brlock_ctdb.c index 35ea71b1af7..429c719031f 100644 --- a/source/cluster/ctdb/brlock_ctdb.c +++ b/source/cluster/ctdb/brlock_ctdb.c @@ -29,7 +29,7 @@ #include "libcli/libcli.h" #include "cluster/cluster.h" #include "ntvfs/common/brlock.h" -#include "cluster/ctdb/include/ctdb.h" +#include "include/ctdb.h" #define ENABLE_NOTIFIES 0 diff --git a/source/cluster/ctdb/common/ctdb.c b/source/cluster/ctdb/common/ctdb.c index ba00e7caa06..94715f62269 100644 --- a/source/cluster/ctdb/common/ctdb.c +++ b/source/cluster/ctdb/common/ctdb.c @@ -24,7 +24,7 @@ #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" /* choose the transport we will use diff --git a/source/cluster/ctdb/common/ctdb_call.c b/source/cluster/ctdb/common/ctdb_call.c index aace5971e27..9b21ce7cb21 100644 --- a/source/cluster/ctdb/common/ctdb_call.c +++ b/source/cluster/ctdb/common/ctdb_call.c @@ -26,7 +26,7 @@ #include "lib/tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" /* queue a packet or die diff --git a/source/cluster/ctdb/common/ctdb_ltdb.c b/source/cluster/ctdb/common/ctdb_ltdb.c index fbf6a3e567a..10bcde43b53 100644 --- a/source/cluster/ctdb/common/ctdb_ltdb.c +++ b/source/cluster/ctdb/common/ctdb_ltdb.c @@ -23,7 +23,7 @@ #include "lib/tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" #include "db_wrap.h" diff --git a/source/cluster/ctdb/common/ctdb_util.c b/source/cluster/ctdb/common/ctdb_util.c index 8e257596099..cf0c72a58b7 100644 --- a/source/cluster/ctdb/common/ctdb_util.c +++ b/source/cluster/ctdb/common/ctdb_util.c @@ -23,7 +23,7 @@ #include "lib/tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" /* return error string for last error @@ -47,7 +47,6 @@ void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...) va_end(ap); } - /* a fatal internal error occurred - no hope for recovery */ diff --git a/source/cluster/ctdb/ctdb_cluster.c b/source/cluster/ctdb/ctdb_cluster.c index 0e7255f0604..1d8d3a52526 100644 --- a/source/cluster/ctdb/ctdb_cluster.c +++ b/source/cluster/ctdb/ctdb_cluster.c @@ -26,7 +26,7 @@ #include "system/filesys.h" #include "cluster/cluster_private.h" #include "lib/tdb/include/tdb.h" -#include "cluster/ctdb/include/ctdb.h" +#include "include/ctdb.h" #include "db_wrap.h" struct cluster_state { diff --git a/source/cluster/ctdb/tcp/tcp_connect.c b/source/cluster/ctdb/tcp/tcp_connect.c index 2404144ac11..e828bb7cbba 100644 --- a/source/cluster/ctdb/tcp/tcp_connect.c +++ b/source/cluster/ctdb/tcp/tcp_connect.c @@ -23,7 +23,7 @@ #include "lib/tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" #include "ctdb_tcp.h" static void set_nonblocking(int fd) diff --git a/source/cluster/ctdb/tcp/tcp_init.c b/source/cluster/ctdb/tcp/tcp_init.c index b8ee8cb30e6..0058e7ad856 100644 --- a/source/cluster/ctdb/tcp/tcp_init.c +++ b/source/cluster/ctdb/tcp/tcp_init.c @@ -23,7 +23,7 @@ #include "lib/events/events.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" #include "ctdb_tcp.h" /* diff --git a/source/cluster/ctdb/tcp/tcp_io.c b/source/cluster/ctdb/tcp/tcp_io.c index 82e24f72607..5385ad7f46d 100644 --- a/source/cluster/ctdb/tcp/tcp_io.c +++ b/source/cluster/ctdb/tcp/tcp_io.c @@ -24,7 +24,7 @@ #include "lib/tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" #include "ctdb_tcp.h" @@ -210,13 +210,6 @@ int ctdb_tcp_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t length) if (length2 != length) { memset(data+length, 0, length2-length); } - { - int i, fd = open("/dev/null", O_WRONLY); - for (i=0;i