X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-no-lock-during-traverse.c;h=c1cb40a49e160cb9b41c691a1fd1c9e34bdc2903;hb=60210a73ec08a7b34ba637ad19e6749cf6dc1952;hp=570562991d4ce65b7d635d1653697ac3e893070d;hpb=fab544c24c1ad6523f95893abcaec4e6cce6c2b4;p=ccan

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 57056299..c1cb40a4 100644
--- a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
@@ -17,7 +17,7 @@
 static bool prepare_entries(struct tdb1_context *tdb)
 {
 	unsigned int i;
-	TDB1_DATA key, data;
+	TDB_DATA key, data;
 
 	for (i = 0; i < NUM_ENTRIES; i++) {
 		key.dsize = sizeof(i);
@@ -34,7 +34,7 @@ static bool prepare_entries(struct tdb1_context *tdb)
 static void delete_entries(struct tdb1_context *tdb)
 {
 	unsigned int i;
-	TDB1_DATA key;
+	TDB_DATA key;
 
 	for (i = 0; i < NUM_ENTRIES; i++) {
 		key.dsize = sizeof(i);
@@ -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, TDB1_DATA key, TDB1_DATA data,
+static int delete_other(struct tdb1_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, TDB1_DATA key, TDB1_DATA data,
 	return 0;
 }
 
-static int delete_self(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int delete_self(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
 			void *private_data)
 {
 	ok1(tdb1_delete(tdb, key) == 0);
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 
 	plan_tests(41);
 	tdb = tdb1_open_ex("run-no-lock-during-traverse.tdb",
-			  1024, TDB1_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR,
+			  1024, TDB_DEFAULT, O_CREAT|O_TRUNC|O_RDWR,
 			  0600, &taplogctx, NULL);
 
 	ok1(tdb);