X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-traverse-in-transaction.c;h=243f2d653f504bfed14bb5e7da5882265e58790d;hp=9cb70686fe4e85242c99d7294901ff827ee1b471;hb=c8f6f8c2dea76042f74c02eff048847e62adcca6;hpb=b929638e3cfe629285af3ecd0813e03eaeaa1133

diff --git a/ccan/tdb2/test/run-tdb1-traverse-in-transaction.c b/ccan/tdb2/test/run-tdb1-traverse-in-transaction.c
index 9cb70686..243f2d65 100644
--- a/ccan/tdb2/test/run-tdb1-traverse-in-transaction.c
+++ b/ccan/tdb2/test/run-tdb1-traverse-in-transaction.c
@@ -12,19 +12,19 @@
 
 static struct agent *agent;
 
-static bool correct_key(TDB1_DATA key)
+static bool correct_key(TDB_DATA key)
 {
 	return key.dsize == strlen("hi")
 		&& memcmp(key.dptr, "hi", key.dsize) == 0;
 }
 
-static bool correct_data(TDB1_DATA data)
+static bool correct_data(TDB_DATA data)
 {
 	return data.dsize == strlen("world")
 		&& memcmp(data.dptr, "world", data.dsize) == 0;
 }
 
-static int traverse(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 		     void *p)
 {
 	ok1(correct_key(key));
@@ -34,8 +34,8 @@ static int traverse(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
 
 int main(int argc, char *argv[])
 {
-	struct tdb1_context *tdb;
-	TDB1_DATA key, data;
+	struct tdb_context *tdb;
+	TDB_DATA key, data;
 
 	plan_tests(13);
 	agent = prepare_external_agent1();
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 		err(1, "preparing agent");
 
 	tdb = tdb1_open_ex("run-traverse-in-transaction.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);
 
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 	data.dptr = (void *)"world";
 	data.dsize = strlen("world");
 
-	ok1(tdb1_store(tdb, key, data, TDB1_INSERT) == 0);
+	ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
 
 	ok1(external_agent_operation1(agent, OPEN, tdb->name) == SUCCESS);