diff options
author | Christian Ambach <ambi@samba.org> | 2013-12-10 17:47:05 +0100 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2013-12-12 14:21:27 -0800 |
commit | 6d88bfcab47abe55fb731b16d7f4fea47d5cd744 (patch) | |
tree | d6c594665011adf27318ea4ef494dd78d839c465 /lib/tdb/common/summary.c | |
parent | 35b4ba0193d783d85283b07f520f0af8dc2c1260 (diff) | |
download | samba-6d88bfcab47abe55fb731b16d7f4fea47d5cd744.tar.gz samba-6d88bfcab47abe55fb731b16d7f4fea47d5cd744.tar.xz samba-6d88bfcab47abe55fb731b16d7f4fea47d5cd744.zip |
lib/tdb: fix compiler warnings
about a variable shadowing a global declaration
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/tdb/common/summary.c')
-rw-r--r-- | lib/tdb/common/summary.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/tdb/common/summary.c b/lib/tdb/common/summary.c index 3c6f755727..a22c17d50d 100644 --- a/lib/tdb/common/summary.c +++ b/lib/tdb/common/summary.c @@ -88,7 +88,7 @@ static size_t get_hash_length(struct tdb_context *tdb, unsigned int i) _PUBLIC_ char *tdb_summary(struct tdb_context *tdb) { tdb_off_t off, rec_off; - struct tally freet, keys, data, dead, extra, hash, uncoal; + struct tally freet, keys, data, dead, extra, hashval, uncoal; struct tdb_record rec; char *ret = NULL; bool locked; @@ -114,7 +114,7 @@ _PUBLIC_ char *tdb_summary(struct tdb_context *tdb) tally_init(&data); tally_init(&dead); tally_init(&extra); - tally_init(&hash); + tally_init(&hashval); tally_init(&uncoal); for (off = TDB_DATA_START(tdb->hash_size); @@ -161,7 +161,7 @@ _PUBLIC_ char *tdb_summary(struct tdb_context *tdb) tally_add(&uncoal, unc - 1); for (off = 0; off < tdb->hash_size; off++) - tally_add(&hash, get_hash_length(tdb, off)); + tally_add(&hashval, get_hash_length(tdb, off)); /* 20 is max length of a %zu. */ len = strlen(SUMMARY_FORMAT) + 35*20 + 1; @@ -180,8 +180,8 @@ _PUBLIC_ char *tdb_summary(struct tdb_context *tdb) dead.min, tally_mean(&dead), dead.max, freet.num, freet.min, tally_mean(&freet), freet.max, - hash.num, - hash.min, tally_mean(&hash), hash.max, + hashval.num, + hashval.min, tally_mean(&hashval), hashval.max, uncoal.total, uncoal.min, tally_mean(&uncoal), uncoal.max, keys.total * 100.0 / tdb->map_size, |