X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-13-delete.c;h=c70fec84828059edbb4fb26e0026ef3233857e6a;hb=f367a1dc8573db0a1f6f49fcda474eb51c192241;hp=6295523bb4ad687a73fd30bd86c5461b28a6a138;hpb=b21004624683be5bf1d8f75e3b5be4e9618049ee;p=ccan

diff --git a/ccan/tdb2/test/run-13-delete.c b/ccan/tdb2/test/run-13-delete.c
index 6295523b..c70fec84 100644
--- a/ccan/tdb2/test/run-13-delete.c
+++ b/ccan/tdb2/test/run-13-delete.c
@@ -1,4 +1,5 @@
 #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>
@@ -11,7 +12,7 @@
 /* We rig the hash so adjacent-numbered records always clash. */
 static uint64_t clash(const void *key, size_t len, uint64_t seed, void *priv)
 {
-	return ((uint64_t)*(unsigned int *)key)
+	return ((uint64_t)*(const unsigned int *)key)
 		<< (64 - TDB_TOPLEVEL_HASH_BITS - 1);
 }
 
@@ -32,9 +33,7 @@ static bool store_records(struct tdb_context *tdb)
 		if (tdb_store(tdb, key, data, TDB_REPLACE) != 0)
 			return false;
 		tdb_fetch(tdb, key, &d);
-		if (d.dsize != data.dsize)
-			return false;
-		if (memcmp(d.dptr, data.dptr, d.dsize) != 0)
+		if (!tdb_deq(d, data))
 			return false;
 		free(d.dptr);
 	}
@@ -179,7 +178,8 @@ int main(int argc, char *argv[])
 		/* Check mixed bitpattern. */
 		test_val(tdb, 0x123456789ABCDEF0ULL);
 
-		ok1(tdb->allrecord_lock.count == 0 && tdb->num_lockrecs == 0);
+		ok1(!tdb->file || (tdb->file->allrecord_lock.count == 0
+				   && tdb->file->num_lockrecs == 0));
 		tdb_close(tdb);
 
 		/* Deleting these entries in the db gave problems. */