From c5b7c4aea8a1d2be1d61c3b909177cb5ef07fd62 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:37:13 +0930 Subject: tdb2: Make tdb1 use the tdb_file structure. Because tdb2 allows multiple opens of the same TDB, we separate out the file information from the struct tdb_context. Do the same for tdb1. Signed-off-by: Rusty Russell (Imported from CCAN commit 60210a73ec08a7b34ba637ad19e6749cf6dc1952) --- lib/tdb2/test/run-tdb1-3G-file.c | 6 +++--- lib/tdb2/test/run-tdb1-corrupt.c | 10 +++++----- lib/tdb2/test/run-tdb1-die-during-transaction.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/tdb2/test') diff --git a/lib/tdb2/test/run-tdb1-3G-file.c b/lib/tdb2/test/run-tdb1-3G-file.c index 98e3a3006c..43e9f2ad9b 100644 --- a/lib/tdb2/test/run-tdb1-3G-file.c +++ b/lib/tdb2/test/run-tdb1-3G-file.c @@ -15,12 +15,12 @@ static int tdb1_expand_file_sparse(struct tdb1_context *tdb, 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 */ diff --git a/lib/tdb2/test/run-tdb1-corrupt.c b/lib/tdb2/test/run-tdb1-corrupt.c index 2a8d31bf66..5aa37ec46c 100644 --- a/lib/tdb2/test/run-tdb1-corrupt.c +++ b/lib/tdb2/test/run-tdb1-corrupt.c @@ -28,14 +28,14 @@ static void tdb1_flip_bit(struct tdb1_context *tdb, unsigned int bit) unsigned int off = bit / CHAR_BIT; unsigned char mask = (1 << (bit % CHAR_BIT)); - if (tdb->map_ptr) - ((unsigned char *)tdb->map_ptr)[off] ^= mask; + if (tdb->file->map_ptr) + ((unsigned char *)tdb->file->map_ptr)[off] ^= mask; else { unsigned char c; - if (pread(tdb->fd, &c, 1, off) != 1) + if (pread(tdb->file->fd, &c, 1, off) != 1) err(1, "pread"); c ^= mask; - if (pwrite(tdb->fd, &c, 1, off) != 1) + if (pwrite(tdb->file->fd, &c, 1, off) != 1) err(1, "pwrite"); } } @@ -78,7 +78,7 @@ static void check_test(struct tdb1_context *tdb) verifiable += ksize + dsize; /* Flip one bit at a time, make sure it detects verifiable bytes. */ - for (i = 0, corrupt = 0; i < tdb->map_size * CHAR_BIT; i++) { + for (i = 0, corrupt = 0; i < tdb->file->map_size * CHAR_BIT; i++) { tdb1_flip_bit(tdb, i); memset(sizes, 0, sizeof(sizes)); if (tdb1_check(tdb, check, sizes) != 0) diff --git a/lib/tdb2/test/run-tdb1-die-during-transaction.c b/lib/tdb2/test/run-tdb1-die-during-transaction.c index 592f75731f..bcd24df554 100644 --- a/lib/tdb2/test/run-tdb1-die-during-transaction.c +++ b/lib/tdb2/test/run-tdb1-die-during-transaction.c @@ -94,7 +94,7 @@ reset: if (setjmp(jmpbuf) != 0) { /* We're partway through. Simulate our death. */ - close(tdb->fd); + close(tdb->file->fd); forget_locking1(); in_transaction = false; -- cgit