tdb2: Make TDB1 use the same tdb_hash() wrapper as TDB2

This means converting the tdb1 inbuilt hash functions to the
tdb2-style, so they return 64 bit.  We truncate to 32 bit everywhere
but in tdb_check() which needs to do so explicitly.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 3e46dde21261966941469a6c75e1b45cd2d26324)

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 5d16de179f..135589203c 100644
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -368,14 +368,14 @@ struct tdb_context {
 	/* Our statistics. */
 	struct tdb_attribute_stats stats;
 
-	/* Are we accessing directly? (debugging check). */
-	int direct_access;
-
 	/* Hash function. */
 	uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
 	void *hash_data;
 	uint64_t hash_seed;
 
+	/* Are we accessing directly? (debugging check). */
+	int direct_access;
+
 	/* Set if we are in a transaction. */
 	struct tdb_transaction *transaction;