[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

@@ -14,8 +14,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id$ */
/* ! \file */
#include <config.h>
@@ -41,7 +39,6 @@ unsigned char buffer[1024];
const char *s;
char str[2 * ISC_SHA512_DIGESTLENGTH + 1];
unsigned char key[20];
int i = 0;
isc_result_t
tohexstr(unsigned char *d, unsigned int len, char *out);
@@ -94,6 +91,7 @@ ATF_TC_HEAD(isc_sha1, tc) {
}
ATF_TC_BODY(isc_sha1, tc) {
isc_sha1_t sha1;
int i;
UNUSED(tc);
@@ -216,13 +214,13 @@ ATF_TC_BODY(isc_sha1, tc) {
}
}
ATF_TC(isc_sha224);
ATF_TC_HEAD(isc_sha224, tc) {
atf_tc_set_md_var(tc, "descr", "sha224 examples from RFC4634");
}
ATF_TC_BODY(isc_sha224, tc) {
isc_sha224_t sha224;
int i;
UNUSED(tc);
@@ -347,7 +345,6 @@ ATF_TC_BODY(isc_sha224, tc) {
testcase++;
}
}
ATF_TC(isc_sha256);
@@ -356,6 +353,7 @@ ATF_TC_HEAD(isc_sha256, tc) {
}
ATF_TC_BODY(isc_sha256, tc) {
isc_sha256_t sha256;
int i;
UNUSED(tc);
@@ -479,7 +477,6 @@ ATF_TC_BODY(isc_sha256, tc) {
testcase++;
}
}
ATF_TC(isc_sha384);
@@ -488,6 +485,7 @@ ATF_TC_HEAD(isc_sha384, tc) {
}
ATF_TC_BODY(isc_sha384, tc) {
isc_sha384_t sha384;
int i;
UNUSED(tc);
@@ -625,7 +623,6 @@ ATF_TC_BODY(isc_sha384, tc) {
testcase++;
}
}
ATF_TC(isc_sha512);
@@ -634,6 +631,7 @@ ATF_TC_HEAD(isc_sha512, tc) {
}
ATF_TC_BODY(isc_sha512, tc) {
isc_sha512_t sha512;
int i;
UNUSED(tc);
@@ -772,7 +770,6 @@ ATF_TC_BODY(isc_sha512, tc) {
testcase++;
}
}
ATF_TC(isc_md5);
@@ -781,6 +778,7 @@ ATF_TC_HEAD(isc_md5, tc) {
}
ATF_TC_BODY(isc_md5, tc) {
isc_md5_t md5;
int i;
UNUSED(tc);