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

[ccan] / ccan / tdb2 / test / run-tdb1-open-during-transaction.c

diff --git a/ccan/tdb2/test/run-tdb1-open-during-transaction.c b/ccan/tdb2/test/run-tdb1-open-during-transaction.c
index 875fc3ca9e6ffee46293c4e3d82ad95e46357bf2..e0b28a536e8f30578d6599688eab544a49da8fea 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-open-during-transaction.c
+++ b/ccan/tdb2/test/run-tdb1-open-during-transaction.c
@@ -18,7 +18,7 @@ static int ftruncate_check(int fd, off_t length);
 #include <stdarg.h>
 #include <err.h>
 #include "tdb1-external-agent.h"
-#include "tdb1-logging.h"
+#include "logging.h"
 
 static struct agent *agent;
 static bool opened;
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
        const int flags[] = { TDB_DEFAULT,
                              TDB_NOMMAP };
        int i;
-       struct tdb1_context *tdb;
+       struct tdb_context *tdb;
        TDB_DATA key, data;
 
        plan_tests(10);
@@ -145,9 +145,9 @@ int main(int argc, char *argv[])
                     "DEFAULT",
                     (flags[i] & TDB_NOMMAP) ? "no mmap" : "mmap");
                unlink(TEST_DBNAME);
-               tdb = tdb1_open_ex(TEST_DBNAME, 1024, flags[i],
-                                 O_CREAT|O_TRUNC|O_RDWR, 0600,
-                                 &taplogctx, NULL);
+               tdb = tdb1_open(TEST_DBNAME, 1024, flags[i],
+                               O_CREAT|O_TRUNC|O_RDWR, 0600,
+                               &tap_log_attr);
                ok1(tdb);
 
                opened = true;