X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-nested-traverse.c;h=cf5aa4a2f458834bfc2ad0d2ea42ee519e0a1ccc;hp=0d58a569ac726d3fbf4389e7cbd000cffaf3266e;hb=c4ca9f54301c0367891be6330f59fdd5dcdd51d1;hpb=49475d68deecd0b31597ed6094229171d2699b11

diff --git a/ccan/tdb2/test/run-tdb1-nested-traverse.c b/ccan/tdb2/test/run-tdb1-nested-traverse.c
index 0d58a569..cf5aa4a2 100644
--- a/ccan/tdb2/test/run-tdb1-nested-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-nested-traverse.c
@@ -38,7 +38,7 @@ static int traverse1(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 	ok1(correct_data(data));
 	ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name)
 	    == WOULD_HAVE_BLOCKED);
-	tdb1_traverse(tdb, traverse2, NULL);
+	tdb_traverse(tdb, traverse2, NULL);
 
 	/* That should *not* release the transaction lock! */
 	ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name)
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
 	if (!agent)
 		err(1, "preparing agent");
 
-	tdb = tdb1_open("run-nested-traverse.tdb", TDB_DEFAULT,
-			O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
+	tdb = tdb_open("run-nested-traverse.tdb1", TDB_VERSION1,
+		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 	ok1(tdb);
 
 	ok1(external_agent_operation1(agent, OPEN, tdb->name) == SUCCESS);
@@ -76,10 +76,12 @@ int main(int argc, char *argv[])
 	data.dptr = (void *)"world";
 	data.dsize = strlen("world");
 
-	ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
-	tdb1_traverse(tdb, traverse1, NULL);
-	tdb1_traverse_read(tdb, traverse1, NULL);
-	tdb1_close(tdb);
+	ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+	tdb_traverse(tdb, traverse1, NULL);
+	tdb_add_flag(tdb, TDB_RDONLY);
+	tdb_traverse(tdb, traverse1, NULL);
+	tdb_remove_flag(tdb, TDB_RDONLY);
+	tdb_close(tdb);
 
 	return exit_status();
 }