tdb2: allow multiple chain locks.

[ccan] / ccan / tdb2 / test / run-11-simple-fetch.c

diff --git a/ccan/tdb2/test/run-11-simple-fetch.c b/ccan/tdb2/test/run-11-simple-fetch.c
index 447da9c2b5ee95d281d34f1f051806db1cf893f2..278d726ad20f3e66d8da80ad8f3244ca045f91b1 100644 (file)
--- a/ccan/tdb2/test/run-11-simple-fetch.c
+++ b/ccan/tdb2/test/run-11-simple-fetch.c
@@ -1,5 +1,6 @@
 #include <ccan/failtest/failtest_override.h>
 #include <ccan/tdb2/tdb.c>
+#include <ccan/tdb2/open.c>
 #include <ccan/tdb2/free.c>
 #include <ccan/tdb2/lock.c>
 #include <ccan/tdb2/io.c>
@@ -29,8 +30,8 @@ int main(int argc, char *argv[])
        int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
                        TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
                        TDB_NOMMAP|TDB_CONVERT };
-       struct tdb_data key = { (unsigned char *)"key", 3 };
-       struct tdb_data data = { (unsigned char *)"data", 4 };
+       struct tdb_data key = tdb_mkdata("key", 3);
+       struct tdb_data data = tdb_mkdata("data", 4);
 
        failtest_init(argc, argv);
        failtest_hook = suppress_failure;
@@ -43,7 +44,7 @@ int main(int argc, char *argv[])
                               O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
                ok1(tdb);
                if (tdb) {
-                       struct tdb_data d;
+                       struct tdb_data d = { NULL, 0 }; /* Bogus GCC warning */
 
                        /* fetch should fail. */
                        failtest_suppress = false;
@@ -59,7 +60,7 @@ int main(int argc, char *argv[])
                        if (!ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS))
                                goto fail;
                        failtest_suppress = true;
-                       ok1(data_equal(d, data));
+                       ok1(tdb_deq(d, data));
                        free(d.dptr);
                        ok1(tdb_check(tdb, NULL, NULL) == 0);
                        tdb_close(tdb);