X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-die-during-transaction.c;h=f45fcedc7abf746136200291c13bce1ddb232894;hb=d9cbd7d4454ae35e4e2f6d18a9469bf26948e4b9;hp=933d748686f21dcff717f399bbf64915a790e8b4;hpb=49475d68deecd0b31597ed6094229171d2699b11;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-die-during-transaction.c b/ccan/tdb2/test/run-tdb1-die-during-transaction.c
index 933d7486..f45fcedc 100644
--- a/ccan/tdb2/test/run-tdb1-die-during-transaction.c
+++ b/ccan/tdb2/test/run-tdb1-die-during-transaction.c
@@ -28,7 +28,7 @@ static int ftruncate_check(int fd, off_t length);
 static bool in_transaction;
 static int target, current;
 static jmp_buf jmpbuf;
-#define TEST_DBNAME "run-die-during-transaction.tdb"
+#define TEST_DBNAME "run-die-during-transaction.tdb1"
 #define KEY_STRING "helloworld"
 
 static void maybe_die(int fd)
@@ -94,8 +94,8 @@ static bool test_death(enum operation op, struct agent *agent)
 	current = target = 0;
 reset:
 	unlink(TEST_DBNAME);
-	tdb = tdb1_open(TEST_DBNAME, TDB_NOMMAP,
-			O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
+	tdb = tdb_open(TEST_DBNAME, TDB_VERSION1|TDB_NOMMAP,
+		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
 	if (setjmp(jmpbuf) != 0) {
 		/* We're partway through.  Simulate our death. */
@@ -144,7 +144,7 @@ reset:
 		/* Suppress logging as this tries to use closed fd. */
 		suppress_logging = true;
 		suppress_lockcheck1 = true;
-		tdb1_close(tdb);
+		tdb_close(tdb);
 		suppress_logging = false;
 		suppress_lockcheck1 = false;
 		target++;
@@ -155,7 +155,7 @@ reset:
 	/* Put key for agent to fetch. */
 	key.dsize = strlen(KEY_STRING);
 	key.dptr = (void *)KEY_STRING;
-	if (tdb1_store(tdb, key, key, TDB_INSERT) != 0)
+	if (tdb_store(tdb, key, key, TDB_INSERT) != TDB_SUCCESS)
 		return false;
 
 	/* This is the key we insert in transaction. */
@@ -170,20 +170,20 @@ reset:
 		errx(1, "Agent failed find key: %s", agent_return_name1(ret));
 
 	in_transaction = true;
-	if (tdb1_transaction_start(tdb) != 0)
+	if (tdb_transaction_start(tdb) != TDB_SUCCESS)
 		return false;
 
-	if (tdb1_store(tdb, key, key, TDB_INSERT) != 0)
+	if (tdb_store(tdb, key, key, TDB_INSERT) != TDB_SUCCESS)
 		return false;
 
-	if (tdb1_transaction_commit(tdb) != 0)
+	if (tdb_transaction_commit(tdb) != TDB_SUCCESS)
 		return false;
 
 	in_transaction = false;
 
 	/* We made it! */
 	diag("Completed %u runs", current);
-	tdb1_close(tdb);
+	tdb_close(tdb);
 	ret = external_agent_operation1(agent, CLOSE, "");
 	if (ret != SUCCESS) {
 		diag("Step %u close failed = %s", current,