tdb2: test: fix run-57-die-during-transaction.c to be more efficient.

[ccan] / ccan / tdb2 / test / run-12-store.c

diff --git a/ccan/tdb2/test/run-12-store.c b/ccan/tdb2/test/run-12-store.c
index 2cc3e86b6a50bb2c650ffdf5aff453c6ca8f4c31..73ffd554f525d6e18922c63abd8279742b3ef232 100644 (file)
--- a/ccan/tdb2/test/run-12-store.c
+++ b/ccan/tdb2/test/run-12-store.c
@@ -1,10 +1,4 @@
-#include <ccan/tdb2/tdb.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"
 
@@ -15,13 +9,6 @@ static uint64_t fixedhash(const void *key, size_t len, uint64_t seed, void *p)
                             *(uint64_t *)p);
 }
 
-static bool equal(struct tdb_data a, struct tdb_data b)
-{
-       if (a.dsize != b.dsize)
-               return false;
-       return memcmp(a.dptr, b.dptr, a.dsize) == 0;
-}
-
 int main(int argc, char *argv[])
 {
        unsigned int i, j;
@@ -29,8 +16,8 @@ int main(int argc, char *argv[])
        uint64_t seed = 16014841315512641303ULL;
        union tdb_attribute fixed_hattr
                = { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-                             .hash_fn = fixedhash,
-                             .hash_private = &seed } };
+                             .fn = fixedhash,
+                             .data = &seed } };
        int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
                        TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
                        TDB_NOMMAP|TDB_CONVERT };
@@ -50,10 +37,10 @@ int main(int argc, char *argv[])
                /* We seemed to lose some keys.
                 * Insert and check they're in there! */
                for (j = 0; j < 500; j++) {
-                       struct tdb_data d;
+                       struct tdb_data d = { NULL, 0 }; /* Bogus GCC warning */
                        ok1(tdb_store(tdb, key, data, TDB_REPLACE) == 0);
                        ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
-                       ok1(equal(d, data));
+                       ok1(tdb_deq(d, data));
                        free(d.dptr);
                }
                tdb_close(tdb);