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

[ccan] / ccan / tdb2 / tdb1_summary.c

diff --git a/ccan/tdb2/tdb1_summary.c b/ccan/tdb2/tdb1_summary.c
index 61e1853579a0e43b021e07830b0291feef293fdc..6e82eec5f2165fcf88ce84fc9f51d9a85bf92b3d 100644 (file)
--- a/ccan/tdb2/tdb1_summary.c
+++ b/ccan/tdb2/tdb1_summary.c
@@ -84,7 +84,7 @@ static size_t get_hash_length(struct tdb1_context *tdb, unsigned int i)
        return count;
 }
 
-_PUBLIC_ char *tdb1_summary(struct tdb1_context *tdb)
+char *tdb1_summary(struct tdb1_context *tdb)
 {
        tdb1_off_t off, rec_off;
        struct tally freet, keys, data, dead, extra, hash, uncoal;
@@ -94,9 +94,8 @@ _PUBLIC_ char *tdb1_summary(struct tdb1_context *tdb)
        size_t len, unc = 0;
        struct tdb1_record recovery;
 
-       /* Read-only databases use no locking at all: it's best-effort.
-        * We may have a write lock already, so skip that case too. */
-       if (tdb->read_only || tdb->allrecord_lock.count != 0) {
+       /* We may have a write lock already, so don't lock. */
+       if (tdb->file->allrecord_lock.count != 0) {
                locked = false;
        } else {
                if (tdb1_lockall_read(tdb) == -1)
@@ -117,7 +116,7 @@ _PUBLIC_ char *tdb1_summary(struct tdb1_context *tdb)
        tally1_init(&uncoal);
 
        for (off = TDB1_DATA_START(tdb->header.hash_size);
-            off < tdb->map_size - 1;
+            off < tdb->file->map_size - 1;
             off += sizeof(rec) + rec.rec_len) {
                if (tdb->methods->tdb1_read(tdb, off, &rec, sizeof(rec),
                                           TDB1_DOCONV()) == -1)
@@ -150,9 +149,11 @@ _PUBLIC_ char *tdb1_summary(struct tdb1_context *tdb)
                        tally1_add(&dead, rec.rec_len);
                        break;
                default:
-                       TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
-                                "Unexpected record magic 0x%x at offset %d\n",
-                                rec.magic, off));
+                       tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT,
+                                               TDB_LOG_ERROR,
+                                               "Unexpected record magic 0x%x"
+                                               " at offset %d",
+                                               rec.magic, off);
                        goto unlock;
                }
        }
@@ -169,7 +170,7 @@ _PUBLIC_ char *tdb1_summary(struct tdb1_context *tdb)
                goto unlock;
 
        snprintf(ret, len, SUMMARY_FORMAT1,
-                tdb->map_size, keys.total+data.total,
+                (tdb1_len_t)tdb->file->map_size, keys.total+data.total,
                 keys.num,
                 keys.min, tally1_mean(&keys), keys.max,
                 data.min, tally1_mean(&data), data.max,
@@ -182,16 +183,16 @@ _PUBLIC_ char *tdb1_summary(struct tdb1_context *tdb)
                 hash.min, tally1_mean(&hash), hash.max,
                 uncoal.total,
                 uncoal.min, tally1_mean(&uncoal), uncoal.max,
-                keys.total * 100.0 / tdb->map_size,
-                data.total * 100.0 / tdb->map_size,
-                extra.total * 100.0 / tdb->map_size,
-                freet.total * 100.0 / tdb->map_size,
-                dead.total * 100.0 / tdb->map_size,
+                keys.total * 100.0 / tdb->file->map_size,
+                data.total * 100.0 / tdb->file->map_size,
+                extra.total * 100.0 / tdb->file->map_size,
+                freet.total * 100.0 / tdb->file->map_size,
+                dead.total * 100.0 / tdb->file->map_size,
                 (keys.num + freet.num + dead.num)
                 * (sizeof(struct tdb1_record) + sizeof(uint32_t))
-                * 100.0 / tdb->map_size,
+                * 100.0 / tdb->file->map_size,
                 tdb->header.hash_size * sizeof(tdb1_off_t)
-                * 100.0 / tdb->map_size);
+                * 100.0 / (tdb1_len_t)tdb->file->map_size);
 
 unlock:
        if (locked) {