tdb2: make tdb1_open use attributes for logging, hash function.

[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 a33efec735012f0991ca53dd6692313916fb1848..1fc8d092773200a657c940970fecc5dae6bcc773 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-nested-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-nested-traverse.c
@@ -7,7 +7,7 @@
 #include <stdbool.h>
 #include <err.h>
 #include "tdb1-external-agent.h"
-#include "tdb1-logging.h"
+#include "logging.h"
 
 static struct agent *agent;
 
@@ -23,7 +23,7 @@ static bool correct_data(TDB_DATA data)
                && memcmp(data.dptr, "world", data.dsize) == 0;
 }
 
-static int traverse2(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
+static int traverse2(struct tdb_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, TDB_DATA key, TDB_DATA data,
        return 0;
 }
 
-static int traverse1(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
+static int traverse1(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
                     void *p)
 {
        ok1(correct_key(key));
@@ -48,7 +48,7 @@ static int traverse1(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
 
 int main(int argc, char *argv[])
 {
-       struct tdb1_context *tdb;
+       struct tdb_context *tdb;
        TDB_DATA key, data;
 
        plan_tests(17);
@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
        if (!agent)
                err(1, "preparing agent");
 
-       tdb = tdb1_open_ex("run-nested-traverse.tdb", 1024, TDB1_CLEAR_IF_FIRST,
-                         O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+       tdb = tdb1_open("run-nested-traverse.tdb", 1024, TDB_DEFAULT,
+                       O_CREAT|O_TRUNC|O_RDWR, 0600, &tap_log_attr);
        ok1(tdb);
 
        ok1(external_agent_operation1(agent, OPEN, tdb->name) == SUCCESS);