X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-no-lock-during-traverse.c;h=a418556d19c3f3df128bca7b8645d89ef291fecf;hp=4035c78c734d59c7e5cf376abe61aa82467733c9;hb=c8c3b3568677e8b0105f84e4ab068c580faf4591;hpb=8a47d50d72ea62e378dc92b150c92c1317c73fa3

diff --git a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
index 4035c78c..a418556d 100644
--- a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
@@ -8,13 +8,13 @@
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
 
 #undef fcntl
 
 #define NUM_ENTRIES 10
 
-static bool prepare_entries(struct tdb1_context *tdb)
+static bool prepare_entries(struct tdb_context *tdb)
 {
 	unsigned int i;
 	TDB_DATA key, data;
@@ -31,7 +31,7 @@ static bool prepare_entries(struct tdb1_context *tdb)
 	return true;
 }
 
-static void delete_entries(struct tdb1_context *tdb)
+static void delete_entries(struct tdb_context *tdb)
 {
 	unsigned int i;
 	TDB_DATA key;
@@ -45,7 +45,7 @@ static void delete_entries(struct tdb1_context *tdb)
 }
 
 /* We don't know how many times this will run. */
-static int delete_other(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
+static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 			void *private_data)
 {
 	unsigned int i;
@@ -57,7 +57,7 @@ static int delete_other(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
 	return 0;
 }
 
-static int delete_self(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
+static int delete_self(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 			void *private_data)
 {
 	ok1(tdb1_delete(tdb, key) == 0);
@@ -66,13 +66,18 @@ static int delete_self(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
 
 int main(int argc, char *argv[])
 {
-	struct tdb1_context *tdb;
+	struct tdb_context *tdb;
 	int errors = 0;
+	union tdb_attribute hsize;
+
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = &tap_log_attr;
+	hsize.tdb1_hashsize.hsize = 1024;
 
 	plan_tests(41);
-	tdb = tdb1_open_ex("run-no-lock-during-traverse.tdb",
-			  1024, TDB1_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR,
-			  0600, &taplogctx, NULL);
+	tdb = tdb_open("run-no-lock-during-traverse.tdb1",
+		       TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
+		       0600, &hsize);
 
 	ok1(tdb);
 	ok1(prepare_entries(tdb));
@@ -100,7 +105,7 @@ int main(int argc, char *argv[])
 	ok1(locking_errors1 == 0);
 	ok1(tdb1_unlockall(tdb) == 0);
 
-	ok1(tdb1_close(tdb) == 0);
+	ok1(tdb_close(tdb) == 0);
 
 	return exit_status();
 }