[v9_9] clean up gcc -Wshadow warnings

4039.	[cleanup]	Cleaned up warnings from gcc -Wshadow. [RT #37381]
This commit is contained in:
Evan Hunt
2015-01-20 14:55:41 -08:00
parent 398a63d660
commit 57f015bd2a
48 changed files with 466 additions and 531 deletions

View File

@@ -52,16 +52,16 @@ ATF_TC_HEAD(getoriginnode, tc) {
ATF_TC_BODY(getoriginnode, tc) {
dns_db_t *db = NULL;
dns_dbnode_t *node = NULL;
isc_mem_t *mctx = NULL;
isc_mem_t *mymctx = NULL;
isc_result_t result;
result = isc_mem_create(0, 0, &mctx);
result = isc_mem_create(0, 0, &mymctx);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_hash_create(mctx, NULL, 256);
result = isc_hash_create(mymctx, NULL, 256);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone,
result = dns_db_create(mymctx, "rbt", dns_rootname, dns_dbtype_zone,
dns_rdataclass_in, 0, NULL, &db);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -74,7 +74,7 @@ ATF_TC_BODY(getoriginnode, tc) {
dns_db_detachnode(db, &node);
dns_db_detach(&db);
isc_mem_detach(&mctx);
isc_mem_detach(&mymctx);
}
/*