ctdb-util: Rename db_wrap to tdb_wrap and make it a build subsystem

This makes it consistent with Samba, to ease transition.

Update unit test code to link to with tdb_wrap instead of including
db_wrap.c.

There are some potential whitespace fixes in this commit that have
been ignored.  CTDB's lib/tdb_wrap will be deleted after the
transition to Samba's lib/tdb_wrap, so there's no point polishing it
too much.

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

24 files changed, 45 insertions, 35 deletions

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 3e19d10b952..7d629dbde18 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "tdb.h"
 #include "lib/util/dlinklist.h"
 #include "system/network.h"
diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 103d89bf2bd..f4d571ec966 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -23,7 +23,7 @@
 #include "system/network.h"
 #include "system/filesys.h"
 #include "../include/ctdb_private.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
 
 /*
diff --git a/ctdb/lib/util/db_wrap.c b/ctdb/lib/tdb_wrap/tdb_wrap.c
index bc174a42a84..2a6dbe5e82d 100644
--- a/ctdb/lib/util/db_wrap.c
+++ b/ctdb/lib/tdb_wrap/tdb_wrap.c
@@ -1,20 +1,20 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    database wrap functions
 
    Copyright (C) Andrew Tridgell 2004
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,7 +29,7 @@
 #include "includes.h"
 #include "lib/util/dlinklist.h"
 #include "tdb.h"
-#include "db_wrap.h"
+#include "tdb_wrap.h"
 
 static struct tdb_wrap *tdb_list;
 
@@ -41,7 +41,7 @@ static int tdb_wrap_destructor(struct tdb_wrap *w)
 	tdb_close(w->tdb);
 	DLIST_REMOVE(tdb_list, w);
 	return 0;
-}				 
+}
 
 static void log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...)
 {
@@ -88,7 +88,7 @@ struct tdb_wrap *tdb_wrap_open(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	w->tdb = tdb_open_ex(name, hash_size, tdb_flags, 
+	w->tdb = tdb_open_ex(name, hash_size, tdb_flags,
 			     open_flags, mode, &log_ctx, NULL);
 	if (w->tdb == NULL) {
 		talloc_free(w);
diff --git a/ctdb/lib/util/db_wrap.h b/ctdb/lib/tdb_wrap/tdb_wrap.h
index 5ae5fd10ae3..b11d9585e34 100644
--- a/ctdb/lib/util/db_wrap.h
+++ b/ctdb/lib/tdb_wrap/tdb_wrap.h
@@ -1,20 +1,20 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    database wrap headers
 
    Copyright (C) Andrew Tridgell 2004
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
diff --git a/ctdb/lib/tdb_wrap/wscript_build b/ctdb/lib/tdb_wrap/wscript_build
new file mode 100755
index 00000000000..39a128aeabc
--- /dev/null
+++ b/ctdb/lib/tdb_wrap/wscript_build
@@ -0,0 +1,7 @@
+#!/usr/bin/python
+
+bld.SAMBA_SUBSYSTEM('tdb-wrap',
+                    source='tdb_wrap.c',
+                    deps='tdb talloc',
+                    local_include=False
+                    )
diff --git a/ctdb/lib/util/wscript_build b/ctdb/lib/util/wscript_build
index 243566860a5..89e69588b00 100755
--- a/ctdb/lib/util/wscript_build
+++ b/ctdb/lib/util/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 bld.SAMBA_SUBSYSTEM('ctdb-util',
-                     source='''util.c util_file.c util_time.c db_wrap.c
+                     source='''util.c util_file.c util_time.c
                                debug.c fault.c idtree.c signal.c
                                substitute.c''',
                       deps='tdb talloc',
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 1f9e4bc5a06..c350cde286c 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -23,7 +23,7 @@
 #include "system/wait.h"
 #include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 
 
 struct ctdb_control_state {
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index bf8b82dd702..fd5413b75f2 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "tdb.h"
 #include "lib/util/dlinklist.h"
 #include "system/network.h"
diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c
index d68b0183ac4..ced2cca5184 100644
--- a/ctdb/server/ctdb_freeze.c
+++ b/ctdb/server/ctdb_freeze.c
@@ -23,7 +23,7 @@
 #include "system/wait.h"
 #include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "../common/rb_tree.h"
 
 /*
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index 5ad2500be68..e1a9fed7720 100644
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -22,7 +22,7 @@
 #include "include/ctdb_protocol.h"
 #include "tevent.h"
 #include "tdb.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "system/filesys.h"
 #include "lib/util/dlinklist.h"
 
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index fb4bb0ab5e5..8fb2bc7ce91 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -25,7 +25,7 @@
 #include "system/time.h"
 #include "../include/ctdb_private.h"
 #include "../common/rb_tree.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
 #include <ctype.h>
 
diff --git a/ctdb/server/ctdb_persistent.c b/ctdb/server/ctdb_persistent.c
index cfbea63cc56..e28622f20e4 100644
--- a/ctdb/server/ctdb_persistent.c
+++ b/ctdb/server/ctdb_persistent.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "tdb.h"
 #include "../include/ctdb_private.h"
 
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index d033b2126e2..c26a048c8bb 100644
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -25,7 +25,7 @@
 #include "system/wait.h"
 #include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 
 
 int 
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 57d278d0286..14e6ea85ad5 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -26,7 +26,7 @@
 #include "cmdline.h"
 #include "../include/ctdb_client.h"
 #include "../include/ctdb_private.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
 
 
diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c
index 64f25306b5d..d19305af076 100644
--- a/ctdb/server/ctdb_traverse.c
+++ b/ctdb/server/ctdb_traverse.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "tdb.h"
 #include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
diff --git a/ctdb/server/ctdb_update_record.c b/ctdb/server/ctdb_update_record.c
index 81e36253c73..418bbb10e1c 100644
--- a/ctdb/server/ctdb_update_record.c
+++ b/ctdb/server/ctdb_update_record.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "tdb.h"
 #include "ctdb_private.h"
 
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 5013339c23f..35f1fe1bfb0 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -25,7 +25,7 @@
 #include "system/filesys.h"
 #include "system/dir.h"
 #include "../include/ctdb_private.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
 #include "../include/ctdb_private.h"
 #include "../common/rb_tree.h"
diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c
index f4dccbaa340..fbbe63d5698 100644
--- a/ctdb/tests/src/ctdb_test.c
+++ b/ctdb/tests/src/ctdb_test.c
@@ -112,7 +112,6 @@ bool ctdb_sys_have_ip(ctdb_sock_addr *addr);
 
 /* UTIL_OBJ */
 #include "lib/util/idtree.c"
-#include "lib/util/db_wrap.c"
 #include "lib/util/util.c"
 #include "lib/util/util_time.c"
 #include "lib/util/util_file.c"
diff --git a/ctdb/tests/src/ctdb_trackingdb_test.c b/ctdb/tests/src/ctdb_trackingdb_test.c
index 760d3140791..18bc174382f 100644
--- a/ctdb/tests/src/ctdb_trackingdb_test.c
+++ b/ctdb/tests/src/ctdb_trackingdb_test.c
@@ -28,7 +28,7 @@
 #include "popt.h"
 #include "cmdline.h"
 #include "ctdb_private.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 
 #define MAXINDEX 64
 char indices[MAXINDEX];
diff --git a/ctdb/tests/src/ctdb_update_record_persistent.c b/ctdb/tests/src/ctdb_update_record_persistent.c
index a0bb383ed52..d73636ea1c7 100644
--- a/ctdb/tests/src/ctdb_update_record_persistent.c
+++ b/ctdb/tests/src/ctdb_update_record_persistent.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "lib/util/db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "system/filesys.h"
 #include "popt.h"
 #include "cmdline.h"
diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c
index 8e193f78a9e..a360ddfc9c7 100644
--- a/ctdb/tests/src/ctdbd_test.c
+++ b/ctdb/tests/src/ctdbd_test.c
@@ -33,7 +33,6 @@ bool fast_start;
 
 /* UTIL_OBJ */
 #include "lib/util/idtree.c"
-#include "lib/util/db_wrap.c"
 #include "lib/util/util.c"
 #include "lib/util/util_time.c"
 #include "lib/util/util_file.c"
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index cc8e37c4108..82783d8dfa1 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -29,7 +29,7 @@
 #include "../include/ctdb_client.h"
 #include "../include/ctdb_private.h"
 #include "../common/rb_tree.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
 
 #define ERR_TIMEOUT	20	/* timed out trying to reach node */
diff --git a/ctdb/tools/ctdb_vacuum.c b/ctdb/tools/ctdb_vacuum.c
index 808b15ca4bf..ae936824308 100644
--- a/ctdb/tools/ctdb_vacuum.c
+++ b/ctdb/tools/ctdb_vacuum.c
@@ -23,7 +23,7 @@
 #include "../include/ctdb_client.h"
 #include "../include/ctdb_private.h"
 #include "../common/rb_tree.h"
-#include "db_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 
 /* should be tunable */
 #define TIMELIMIT() timeval_current_ofs(10, 0)
diff --git a/ctdb/wscript b/ctdb/wscript
index 0d560651389..3570b009ab5 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -173,6 +173,7 @@ def build(bld):
     if bld.CHECK_FOR_THIRD_PARTY():
         bld.RECURSE('third_party/popt')
 
+    bld.RECURSE('lib/tdb_wrap')
     bld.RECURSE('lib/util')
 
     bld.RECURSE('lib/talloc')
@@ -238,7 +239,8 @@ def build(bld):
                         source=bld.SUBDIR('client', 'ctdb_client.c'),
                         includes='include include/internal lib/util',
                         public_headers='include/ctdb_client.h',
-                        deps='replace popt talloc tevent tdb ctdb-util')
+                        deps='''replace popt talloc tevent tdb
+                                ctdb-util tdb-wrap''')
 
     bld.SAMBA_SUBSYSTEM('ctdb-server',
                         source='server/ctdbd.c ' +
@@ -451,20 +453,23 @@ def build(bld):
 
     bld.SAMBA_BINARY('ctdb_takeover_tests',
                      source='tests/src/ctdb_takeover_tests.c',
-                     deps='replace popt tdb tevent talloc ctdb-system' +
+                     deps='''replace popt tdb tevent talloc ctdb-system
+                             tdb-wrap''' +
                           ib_deps,
                      includes='include include/internal lib/util',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     bld.SAMBA_BINARY('ctdb_functest',
                      source='tests/src/ctdb_functest.c',
-                     deps='replace tdb tevent talloc popt ctdb-system',
+                     deps='''replace tdb tevent talloc popt ctdb-system
+                             tdb-wrap''',
                      includes='include include/internal lib/util',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     bld.SAMBA_BINARY('ctdb_stubtest',
                      source='tests/src/ctdb_test.c',
-                     deps='replace tdb tevent talloc popt ctdb-system',
+                     deps='''replace tdb tevent talloc popt ctdb-system
+                             tdb-wrap''',
                      includes='include include/internal lib/util',
                      install_path='${CTDB_TEST_LIBDIR}')