summaryrefslogtreecommitdiff
path: root/lib/tdb2/free.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-03-22 10:47:27 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-03-22 01:57:38 +0100
commit4ea9f8d4c0d08343910d85f44eebdd2d7bff6571 (patch)
tree655d33a3a9350b1217ed1d3ef0b0edbd43034dc4 /lib/tdb2/free.c
parenta93e03d27de573988263aa4e39e55e7edbe34069 (diff)
downloadsamba-4ea9f8d4c0d08343910d85f44eebdd2d7bff6571.tar.gz
samba-4ea9f8d4c0d08343910d85f44eebdd2d7bff6571.tar.bz2
samba-4ea9f8d4c0d08343910d85f44eebdd2d7bff6571.zip
lib/tdb2: fix -Wshadow warnings.
These warnings clutter things up, even though they're of marginal utility. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/free.c')
-rw-r--r--lib/tdb2/free.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/tdb2/free.c b/lib/tdb2/free.c
index a6d4c7a4c7..0868a6ea30 100644
--- a/lib/tdb2/free.c
+++ b/lib/tdb2/free.c
@@ -585,7 +585,7 @@ unlock_err:
enum TDB_ERROR add_free_record(struct tdb_context *tdb,
tdb_off_t off, tdb_len_t len_with_header,
enum tdb_lock_flags waitflag,
- bool coalesce)
+ bool coalesce_ok)
{
tdb_off_t b_off;
tdb_len_t len;
@@ -601,11 +601,11 @@ enum TDB_ERROR add_free_record(struct tdb_context *tdb,
return ecode;
}
- ecode = enqueue_in_free(tdb, b_off, off, len, &coalesce);
+ ecode = enqueue_in_free(tdb, b_off, off, len, &coalesce_ok);
check_list(tdb, b_off);
/* Coalescing unlocks free list. */
- if (!ecode && coalesce)
+ if (!ecode && coalesce_ok)
ecode = coalesce_list(tdb, tdb->tdb2.ftable_off, b_off, 2);
else
tdb_unlock_free_bucket(tdb, b_off);