tdb2: use tdb->flags & TDB_RDONLY instead of tdb->read_only for TDB1 code.

[ccan] / ccan / tdb2 / test / run-tdb1-3G-file.c

diff --git a/ccan/tdb2/test/run-tdb1-3G-file.c b/ccan/tdb2/test/run-tdb1-3G-file.c
index 98e3a3006c32da683305e77fe84c63d33146f687..fcb1a0c757f7021f79628b5694a2e04e627941e8 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-3G-file.c
+++ b/ccan/tdb2/test/run-tdb1-3G-file.c
@@ -10,17 +10,17 @@ static int tdb1_expand_file_sparse(struct tdb1_context *tdb,
                                  tdb1_off_t size,
                                  tdb1_off_t addition)
 {
-       if (tdb->read_only || tdb->traverse_read) {
+       if ((tdb->flags & TDB_RDONLY) || tdb->traverse_read) {
                tdb->last_error = TDB_ERR_RDONLY;
                return -1;
        }
 
-       if (ftruncate(tdb->fd, size+addition) == -1) {
+       if (ftruncate(tdb->file->fd, size+addition) == -1) {
                char b = 0;
-               ssize_t written = pwrite(tdb->fd,  &b, 1, (size+addition) - 1);
+               ssize_t written = pwrite(tdb->file->fd,  &b, 1, (size+addition) - 1);
                if (written == 0) {
                        /* try once more, potentially revealing errno */
-                       written = pwrite(tdb->fd,  &b, 1, (size+addition) - 1);
+                       written = pwrite(tdb->file->fd,  &b, 1, (size+addition) - 1);
                }
                if (written == 0) {
                        /* again - give up, guessing errno */
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
        free(data.dptr);
 
        /* That currently fills at the end, make sure that's true. */
-       hash = tdb->hash_fn(&key);
+       hash = tdb_hash(tdb, key.dptr, key.dsize);
        rec_ptr = tdb1_find_lock_hash(tdb, key, hash, F_RDLCK, &rec);
        ok1(rec_ptr);
        ok1(rec_ptr > 2U*1024*1024*1024);