X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-open-during-transaction.c;h=d03f7d95a09ee53dd70b10515b468fe0ea3f3ce1;hp=e0b28a536e8f30578d6599688eab544a49da8fea;hb=b3ae89992ecaffed31dcc2e912539c289478801a;hpb=a446f1d4d161d66bbb19ba2551cf6429a4865964

diff --git a/ccan/tdb2/test/run-tdb1-open-during-transaction.c b/ccan/tdb2/test/run-tdb1-open-during-transaction.c
index e0b28a53..d03f7d95 100644
--- a/ccan/tdb2/test/run-tdb1-open-during-transaction.c
+++ b/ccan/tdb2/test/run-tdb1-open-during-transaction.c
@@ -23,7 +23,7 @@ static int ftruncate_check(int fd, off_t length);
 static struct agent *agent;
 static bool opened;
 static int errors = 0;
-#define TEST_DBNAME "run-open-during-transaction.tdb"
+#define TEST_DBNAME "run-open-during-transaction.tdb1"
 
 #undef write
 #undef pwrite
@@ -133,6 +133,11 @@ int main(int argc, char *argv[])
 	int i;
 	struct tdb_context *tdb;
 	TDB_DATA key, data;
+	union tdb_attribute hsize;
+
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = &tap_log_attr;
+	hsize.tdb1_hashsize.hsize = 1024;
 
 	plan_tests(10);
 	agent = prepare_external_agent1();
@@ -145,24 +150,24 @@ int main(int argc, char *argv[])
 		     "DEFAULT",
 		     (flags[i] & TDB_NOMMAP) ? "no mmap" : "mmap");
 		unlink(TEST_DBNAME);
-		tdb = tdb1_open(TEST_DBNAME, 1024, flags[i],
-				O_CREAT|O_TRUNC|O_RDWR, 0600,
-				&tap_log_attr);
+		tdb = tdb_open(TEST_DBNAME, flags[i]|TDB_VERSION1,
+			       O_CREAT|O_TRUNC|O_RDWR, 0600,
+			       &hsize);
 		ok1(tdb);
 
 		opened = true;
-		ok1(tdb1_transaction_start(tdb) == 0);
+		ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
 		key.dsize = strlen("hi");
 		key.dptr = (void *)"hi";
 		data.dptr = (void *)"world";
 		data.dsize = strlen("world");
 
-		ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
-		ok1(tdb1_transaction_commit(tdb) == 0);
+		ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+		ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
 		ok(!errors, "We had %u open errors", errors);
 
 		opened = false;
-		tdb1_close(tdb);
+		tdb_close(tdb);
 	}
 
 	return exit_status();