tdb2: Make TDB1 code use TDB2's open flags.

[ccan] / ccan / tdb2 / test / run-tdb1-nested-traverse.c

diff --git a/ccan/tdb2/test/run-tdb1-nested-traverse.c b/ccan/tdb2/test/run-tdb1-nested-traverse.c
index 9a17b5601983cfe7b2670f295c7506af8e3baf7f..5eadc184ff9c029ce30983bde7468d430a11b968 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-nested-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-nested-traverse.c
@@ -11,19 +11,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 traverse2(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int traverse2(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
                     void *p)
 {
        ok1(correct_key(key));
@@ -31,7 +31,7 @@ static int traverse2(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
        return 0;
 }
 
-static int traverse1(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int traverse1(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
                     void *p)
 {
        ok1(correct_key(key));
@@ -49,14 +49,14 @@ static int traverse1(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
 int main(int argc, char *argv[])
 {
        struct tdb1_context *tdb;
-       TDB1_DATA key, data;
+       TDB_DATA key, data;
 
        plan_tests(17);
        agent = prepare_external_agent1();
        if (!agent)
                err(1, "preparing agent");
 
-       tdb = tdb1_open_ex("run-nested-traverse.tdb", 1024, TDB1_CLEAR_IF_FIRST,
+       tdb = tdb1_open_ex("run-nested-traverse.tdb", 1024, TDB_DEFAULT,
                          O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
        ok1(tdb);
 
@@ -71,7 +71,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);
        tdb1_traverse(tdb, traverse1, NULL);
        tdb1_traverse_read(tdb, traverse1, NULL);
        tdb1_close(tdb);