X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-20-growhash.c;h=1b6e7450e240ec8dacb462c0423bc7d249c33a33;hb=e1fd1d9623ef2f944374d67b573a6f1cf7a9ed12;hp=6bcfd7d3baee007dbb29633068ef0c6010160113;hpb=6804501c350181dea8f531142b28c620b70edbd9;p=ccan diff --git a/ccan/tdb2/test/run-20-growhash.c b/ccan/tdb2/test/run-20-growhash.c index 6bcfd7d3..1b6e7450 100644 --- a/ccan/tdb2/test/run-20-growhash.c +++ b/ccan/tdb2/test/run-20-growhash.c @@ -1,15 +1,17 @@ #include +#include #include #include #include #include +#include #include #include #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, @@ -76,7 +78,7 @@ int main(int argc, char *argv[]) /* Check first still exists. */ kdata = make_key(0, 0, 0, 0, 0, 0); - ok1(find_and_lock(tdb, key, F_RDLCK, &h, &rec) != 0); + ok1(find_and_lock(tdb, key, F_RDLCK, &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. */ @@ -98,7 +100,7 @@ int main(int argc, char *argv[]) ok1(tdb_store(tdb, key, dbuf, TDB_INSERT) == 0); ok1(tdb_check(tdb, NULL, NULL) == 0); - ok1(find_and_lock(tdb, key, F_RDLCK, &h, &rec) != 0); + ok1(find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL)); /* Should have created correct hash. */ ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize)); /* Should have moved to subhash */ @@ -122,7 +124,7 @@ int main(int argc, char *argv[]) ok1(tdb_store(tdb, key, dbuf, TDB_INSERT) == 0); ok1(tdb_check(tdb, NULL, NULL) == 0); - ok1(find_and_lock(tdb, key, F_RDLCK, &h, &rec) != 0); + ok1(find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL)); /* Should have created correct hash. */ ok1(h.h == tdb_hash(tdb, key.dptr, key.dsize)); /* Should have moved to subhash */