tdb2: Make tdb1 share tdb_store flags, struct tdb_data and TDB_MAGIC_FOOD.

[ccan] / ccan / tdb2 / test / run-open-multiple-times.c

diff --git a/ccan/tdb2/test/run-open-multiple-times.c b/ccan/tdb2/test/run-open-multiple-times.c
index 1f35648bb192c445da0fe49a455d95ea544991c1..f49e65d8b62231b1867c1fc21b36cbfba5e05030 100644 (file)
--- a/ccan/tdb2/test/run-open-multiple-times.c
+++ b/ccan/tdb2/test/run-open-multiple-times.c
@@ -1,11 +1,4 @@
-#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>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
@@ -34,8 +27,7 @@ int main(int argc, char *argv[])
                /* Store in one, fetch in the other. */
                ok1(tdb_store(tdb, key, data, TDB_REPLACE) == 0);
                ok1(tdb_fetch(tdb2, key, &d) == TDB_SUCCESS);
-               ok1(d.dptr && d.dsize == data.dsize
-                   && memcmp(d.dptr, data.dptr, d.dsize) == 0);
+               ok1(tdb_deq(d, data));
                free(d.dptr);
 
                /* Vice versa, with delete. */
@@ -47,8 +39,7 @@ int main(int argc, char *argv[])
 
                ok1(tdb_store(tdb2, key, data, TDB_REPLACE) == 0);
                ok1(tdb_fetch(tdb2, key, &d) == TDB_SUCCESS);
-               ok1(d.dptr && d.dsize == data.dsize
-                   && memcmp(d.dptr, data.dptr, d.dsize) == 0);
+               ok1(tdb_deq(d, data));
                free(d.dptr);
 
                /* Reopen */
@@ -75,8 +66,7 @@ int main(int argc, char *argv[])
                ok1(tdb_close(tdb2) == 0);
 
                ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
-               ok1(d.dptr && d.dsize == data.dsize
-                   && memcmp(d.dptr, data.dptr, d.dsize) == 0);
+               ok1(tdb_deq(d, data));
                free(d.dptr);
                ok1(tdb_close(tdb) == 0);
                ok1(tap_log_messages == 4);