summaryrefslogtreecommitdiff
path: root/lib/tdb2/check.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/check.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/check.c')
-rw-r--r--lib/tdb2/check.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tdb2/check.c b/lib/tdb2/check.c
index 6ad1ebd362..9fe60e5409 100644
--- a/lib/tdb2/check.c
+++ b/lib/tdb2/check.c
@@ -84,7 +84,7 @@ static enum TDB_ERROR check_header(struct tdb_context *tdb, tdb_off_t *recovery,
for (off = hdr.capabilities; off && ecode == TDB_SUCCESS; off = next) {
const struct tdb_capability *cap;
- enum TDB_ERROR err;
+ enum TDB_ERROR e;
cap = tdb_access_read(tdb, off, sizeof(*cap), true);
if (TDB_PTR_IS_ERR(cap)) {
@@ -92,11 +92,11 @@ static enum TDB_ERROR check_header(struct tdb_context *tdb, tdb_off_t *recovery,
}
/* All capabilities are unknown. */
- err = unknown_capability(tdb, "tdb_check", cap->type);
+ e = unknown_capability(tdb, "tdb_check", cap->type);
next = cap->next;
tdb_access_release(tdb, cap);
- if (err)
- return err;
+ if (e)
+ return e;
(*num_capabilities)++;
}