ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[master] clean up gcc -Wshadow warnings

Browse Source 
4039.	[cleanup]	Cleaned up warnings from gcc -Wshadow. [RT #37381]
This commit is contained in:
Evan Hunt
2015-01-20 13:29:18 -08:00
parent cc0a48a381
commit 11463c0ac2
53 changed files with 502 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/samples/nsprobe.c
View File

@@ -61,7 +61,7 @@ static isc_appctx_t *actx = NULL;
static isc_mem_t *mctx = NULL;
static unsigned int outstanding_probes = 0;
const char *cacheserver = "127.0.0.1";
static FILE *fp;
static FILE *input;
typedef enum {
none,
@@ -979,7 +979,7 @@ probe_domain(struct probe_trans *trans) {
REQUIRE(outstanding_probes < MAX_PROBES);
/* Construct domain */
cp = fgets(buf, sizeof(buf), fp);
cp = fgets(buf, sizeof(buf), input);
if (cp == NULL)
return (ISC_R_NOMORE);
if ((cp = strchr(buf, '\n')) != NULL) /* zap NL if any */
@@ -1128,10 +1128,10 @@ main(int argc, char *argv[]) {
/* Open input file */
if (argc == 0)
fp = stdin;
input = stdin;
else {
fp = fopen(argv[0], "r");
if (fp == NULL) {
input = fopen(argv[0], "r");
if (input == NULL) {
fprintf(stderr, "failed to open input file: %s\n",
argv[0]);
exit(1);