X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-04-basichash.c;h=d53533983758cad8204652780bed2d1316022c97;hb=d70577b6aff24ccf6815896509dabb8c9ac07904;hp=ba70cc37143b90a57800bf331665a66774a24ea9;hpb=6804501c350181dea8f531142b28c620b70edbd9;p=ccan-lca-2011.git

diff --git a/ccan/tdb2/test/run-04-basichash.c b/ccan/tdb2/test/run-04-basichash.c
index ba70cc3..d535339 100644
--- a/ccan/tdb2/test/run-04-basichash.c
+++ b/ccan/tdb2/test/run-04-basichash.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 
 		v = 0;
 		/* Should not find it. */
-		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec) == 0);
+		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL) == 0);
 		/* Should have created correct hash. */
 		ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize));
 		/* Should have located space in group 0, bucket 0. */
@@ -84,7 +84,8 @@ int main(int argc, char *argv[])
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 		/* Now, this should give a successful lookup. */
-		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec) == new_off);
+		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL)
+		    == new_off);
 		/* Should have created correct hash. */
 		ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize));
 		/* Should have located space in group 0, bucket 0. */
@@ -110,7 +111,7 @@ int main(int argc, char *argv[])
 
 		/* Test expansion. */
 		v = 1;
-		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec) == 0);
+		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL) == 0);
 		/* Should have created correct hash. */
 		ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize));
 		/* Should have located space in group 0, bucket 1. */
@@ -146,7 +147,8 @@ int main(int argc, char *argv[])
 
 		/* Should be able to find it. */
 		v = 0;
-		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec) == new_off);
+		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL)
+		    == new_off);
 		/* Should have created correct hash. */
 		ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize));
 		/* Should have located space in expanded group 0, bucket 0. */
@@ -167,7 +169,7 @@ int main(int argc, char *argv[])
 
 		/* Simple delete should work. */
 		ok1(delete_from_hash(tdb, &h) == 0);
-		ok1(add_free_record(tdb, rec_zone_bits(&rec), new_off,
+		ok1(add_free_record(tdb, new_off,
 				    sizeof(struct tdb_used_record)
 				    + rec_key_length(&rec)
 				    + rec_data_length(&rec)
@@ -178,7 +180,7 @@ int main(int argc, char *argv[])
 
 		/* Test second-level expansion: should expand 0th bucket. */
 		v = 0;
-		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec) == 0);
+		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL) == 0);
 		/* Should have created correct hash. */
 		ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize));
 		/* Should have located space in group 0, bucket 0. */
@@ -210,7 +212,7 @@ int main(int argc, char *argv[])
 		/* Should be happy with expansion. */
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 
-		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec) == 0);
+		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL) == 0);
 		/* Should have created correct hash. */
 		ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize));
 		/* Should have located space in group 0, bucket 0. */
@@ -241,7 +243,8 @@ int main(int argc, char *argv[])
 
 		/* Should be able to find it. */
 		v = 0;
-		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec) == new_off);
+		ok1(find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL)
+		    == new_off);
 		/* Should have created correct hash. */
 		ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize));
 		/* Should have located space in expanded group 0, bucket 0. */