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

[ccan] / ccan / tdb2 / test / run-tdb1-oldhash.c

diff --git a/ccan/tdb2/test/run-tdb1-oldhash.c b/ccan/tdb2/test/run-tdb1-oldhash.c
index ea56dd3c8ce9c7a64e4bdd4744309a7ad1aeecf5..5219d5c30a246a25df81eae2f80da8c08833bb0a 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-oldhash.c
+++ b/ccan/tdb2/test/run-tdb1-oldhash.c
@@ -2,36 +2,41 @@
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
 
 int main(int argc, char *argv[])
 {
        struct tdb_context *tdb;
+       union tdb_attribute incompat_hash_attr;
+
+       incompat_hash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+       incompat_hash_attr.base.next = &tap_log_attr;
+       incompat_hash_attr.hash.fn = tdb1_incompatible_hash;
 
        plan_tests(8);
 
        /* Old format (with zeroes in the hash magic fields) should
         * open with any hash (since we don't know what hash they used). */
-       tdb = tdb1_open_ex("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0,
-                         &taplogctx, NULL);
+       tdb = tdb1_open("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0,
+                       &tap_log_attr);
        ok1(tdb);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
        tdb1_close(tdb);
 
-       tdb = tdb1_open_ex("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0,
-                         &taplogctx, NULL);
+       tdb = tdb1_open("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0,
+                       &tap_log_attr);
        ok1(tdb);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
        tdb1_close(tdb);
 
-       tdb = tdb1_open_ex("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0,
-                         &taplogctx, tdb1_incompatible_hash);
+       tdb = tdb1_open("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0,
+                       &incompat_hash_attr);
        ok1(tdb);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
        tdb1_close(tdb);
 
-       tdb = tdb1_open_ex("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0,
-                         &taplogctx, tdb1_incompatible_hash);
+       tdb = tdb1_open("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0,
+                       &incompat_hash_attr);
        ok1(tdb);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
        tdb1_close(tdb);