tdb2: add TDB_ATTRIBUTE_TDB1_HASHSIZE

[ccan] / ccan / tdb2 / check.c

diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c
index 88b86429cb97aed7a2486f53a7699626d7fc3041..6d846f414264404255eac5f67d0c93ea824b219b 100644 (file)
--- a/ccan/tdb2/check.c
+++ b/ccan/tdb2/check.c
@@ -478,7 +478,7 @@ static enum TDB_ERROR check_free(struct tdb_context *tdb,
 
        }
 
-       ecode = tdb->methods->oob(tdb, off
+       ecode = tdb->tdb2.io->oob(tdb, off
                                  + frec_len(frec)
                                  + sizeof(struct tdb_used_record),
                                  false);
@@ -533,11 +533,13 @@ static enum TDB_ERROR check_free_table(struct tdb_context *tdb,
 
                h = bucket_off(ftable_off, i);
                for (off = tdb_read_off(tdb, h); off; off = f.next) {
-                       if (!first)
-                               first = off;
                        if (TDB_OFF_IS_ERR(off)) {
                                return off;
                        }
+                       if (!first) {
+                               off &= TDB_OFF_MASK;
+                               first = off;
+                       }
                        ecode = tdb_read_convert(tdb, off, &f, sizeof(f));
                        if (ecode != TDB_SUCCESS) {
                                return ecode;
@@ -585,7 +587,7 @@ tdb_off_t dead_space(struct tdb_context *tdb, tdb_off_t off)
 
        for (len = 0; off + len < tdb->file->map_size; len++) {
                char c;
-               ecode = tdb->methods->tread(tdb, off, &c, 1);
+               ecode = tdb->tdb2.io->tread(tdb, off, &c, 1);
                if (ecode != TDB_SUCCESS) {
                        return ecode;
                }