X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-20-growhash.c;h=65cead03584dbf47c16cb89ba6d279fff1250339;hp=160f37deb02f63a2e5db8f9d55984bbb77604e91;hb=926996e88c32445c874ff9c4f47f159db6b45995;hpb=5e8b9af5e7fe5f1ccac407873a3b782b8a629782

diff --git a/ccan/tdb2/test/run-20-growhash.c b/ccan/tdb2/test/run-20-growhash.c
index 160f37de..65cead03 100644
--- a/ccan/tdb2/test/run-20-growhash.c
+++ b/ccan/tdb2/test/run-20-growhash.c
@@ -1,16 +1,10 @@
-#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/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
 static uint64_t myhash(const void *key, size_t len, uint64_t seed, void *priv)
 {
-	return *(uint64_t *)key;
+	return *(const uint64_t *)key;
 }
 
 static void add_bits(uint64_t *val, unsigned new, unsigned new_bits,
@@ -48,7 +42,7 @@ int main(int argc, char *argv[])
 	struct tdb_data key = { (unsigned char *)&kdata, sizeof(kdata) };
 	struct tdb_data dbuf = { (unsigned char *)&kdata, sizeof(kdata) };
 	union tdb_attribute hattr = { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-						.hash_fn = myhash } };
+						.fn = myhash } };
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
 			TDB_NOMMAP|TDB_CONVERT,
@@ -62,7 +56,7 @@ int main(int argc, char *argv[])
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		struct hash_info h;
 
-		tdb = tdb_open("run-04-basichash.tdb", flags[i],
+		tdb = tdb_open("run-20-growhash.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &hattr);
 		ok1(tdb);
 		if (!tdb)