X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fsummary.c;h=a369f30ed22f5022da5935021d276e5f603b6749;hp=c26e3c5ebe08d79dd1e03b8d5c97adf8e473a080;hb=788c3a4f3469afa00c7414451a5f93e584ce0187;hpb=b21004624683be5bf1d8f75e3b5be4e9618049ee

diff --git a/ccan/tdb2/summary.c b/ccan/tdb2/summary.c
index c26e3c5e..a369f30e 100644
--- a/ccan/tdb2/summary.c
+++ b/ccan/tdb2/summary.c
@@ -52,7 +52,9 @@ static enum TDB_ERROR summarize(struct tdb_context *tdb,
 	tdb_len_t len;
 	tdb_len_t unc = 0;
 
-	for (off = sizeof(struct tdb_header); off < tdb->map_size; off += len) {
+	for (off = sizeof(struct tdb_header);
+	     off < tdb->file->map_size;
+	     off += len) {
 		const union {
 			struct tdb_used_record u;
 			struct tdb_free_record f;
@@ -167,13 +169,13 @@ enum TDB_ERROR tdb_summary(struct tdb_context *tdb,
 
 	ecode = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false);
 	if (ecode != TDB_SUCCESS) {
-		return ecode;
+		return tdb->last_error = ecode;
 	}
 
 	ecode = tdb_lock_expand(tdb, F_RDLCK);
 	if (ecode != TDB_SUCCESS) {
 		tdb_allrecord_unlock(tdb, F_RDLCK);
-		return ecode;
+		return tdb->last_error = ecode;
 	}
 
 	/* Start stats off empty. */
@@ -228,7 +230,7 @@ enum TDB_ERROR tdb_summary(struct tdb_context *tdb,
 	}
 
 	sprintf(*summary, SUMMARY_FORMAT,
-		(size_t)tdb->map_size,
+		(size_t)tdb->file->map_size,
 		tally_num(keys) + tally_num(data),
 		tally_num(keys),
 		tally_min(keys), tally_mean(keys), tally_max(keys),
@@ -253,19 +255,19 @@ enum TDB_ERROR tdb_summary(struct tdb_context *tdb,
 		tally_num(hashes),
 		tally_min(hashes), tally_mean(hashes), tally_max(hashes),
 		hashesg ? hashesg : "",
-		tally_total(keys, NULL) * 100.0 / tdb->map_size,
-		tally_total(data, NULL) * 100.0 / tdb->map_size,
-		tally_total(extra, NULL) * 100.0 / tdb->map_size,
-		tally_total(freet, NULL) * 100.0 / tdb->map_size,
+		tally_total(keys, NULL) * 100.0 / tdb->file->map_size,
+		tally_total(data, NULL) * 100.0 / tdb->file->map_size,
+		tally_total(extra, NULL) * 100.0 / tdb->file->map_size,
+		tally_total(freet, NULL) * 100.0 / tdb->file->map_size,
 		(tally_num(keys) + tally_num(freet) + tally_num(hashes))
-		* sizeof(struct tdb_used_record) * 100.0 / tdb->map_size,
+		* sizeof(struct tdb_used_record) * 100.0 / tdb->file->map_size,
 		tally_num(ftables) * sizeof(struct tdb_freetable)
-		* 100.0 / tdb->map_size,
+		* 100.0 / tdb->file->map_size,
 		(tally_num(hashes)
 		 * (sizeof(tdb_off_t) << TDB_SUBLEVEL_HASH_BITS)
 		 + (sizeof(tdb_off_t) << TDB_TOPLEVEL_HASH_BITS)
 		 + sizeof(struct tdb_chain) * tally_num(chains))
-		* 100.0 / tdb->map_size);
+		* 100.0 / tdb->file->map_size);
 
 unlock:
 	free(hashesg);
@@ -287,5 +289,5 @@ unlock:
 
 	tdb_allrecord_unlock(tdb, F_RDLCK);
 	tdb_unlock_expand(tdb, F_RDLCK);
-	return ecode;
+	return tdb->last_error = ecode;
 }