diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2007-09-27 01:45:22 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2007-09-27 01:45:22 +0000 |
| commit | 16b95fc77316fdd3866f7de4ebb5d14bd136ac11 (patch) | |
| tree | b30e7469d7d0c15d766747c9405ded68894718d5 /tests/server/tftpd.c | |
| parent | 9c5cd6c4137e2c0f238b6f767fe40fdacb9b6ede (diff) | |
Enabled a few more gcc warnings with --enable-debug. Renamed a few
variables to avoid shadowing global declarations.
Diffstat (limited to 'tests/server/tftpd.c')
| -rw-r--r-- | tests/server/tftpd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index e7fae0d47..416317eac 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -286,7 +286,7 @@ static int writeit(struct testcase *test, struct tftphdr **dpp, */ static ssize_t write_behind(struct testcase *test, int convert) { - char *buf; + char *writebuf; int count; int ct; char *p; @@ -312,15 +312,15 @@ static ssize_t write_behind(struct testcase *test, int convert) b->counter = BF_FREE; /* reset flag */ dp = (struct tftphdr *)b->buf; nextone = !nextone; /* incr for next time */ - buf = dp->th_data; + writebuf = dp->th_data; if (count <= 0) return -1; /* nak logic? */ if (convert == 0) - return write(test->ofile, buf, count); + return write(test->ofile, writebuf, count); - p = buf; + p = writebuf; ct = count; while (ct--) { /* loop over the buffer */ c = *p++; /* pick up a character */ @@ -363,8 +363,8 @@ static int synchnet(curl_socket_t f /* socket to flush */) #endif int j = 0; char rbuf[PKTSIZE]; - struct sockaddr_in from; - socklen_t fromlen; + struct sockaddr_in fromaddr; + socklen_t fromaddrlen; while (1) { #if defined(HAVE_IOCTLSOCKET) @@ -374,9 +374,9 @@ static int synchnet(curl_socket_t f /* socket to flush */) #endif if (i) { j++; - fromlen = sizeof from; + fromaddrlen = sizeof fromaddr; (void) recvfrom(f, rbuf, sizeof (rbuf), 0, - (struct sockaddr *)&from, &fromlen); + (struct sockaddr *)&fromaddr, &fromaddrlen); } else break; |