From: Daniel Stenberg Date: Thu, 22 Aug 2013 11:44:37 +0000 (+0200) Subject: tftpd: convert 6 global variables into local ones X-Git-Tag: curl-7_33_0~232 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=816b639035dfdcf83c0d569bb7d22b806beacde9;p=curl tftpd: convert 6 global variables into local ones --- diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 10f88a1e0..8ce363939 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -200,14 +200,6 @@ static curl_socket_t peer = CURL_SOCKET_BAD; static int timeout; static int maxtimeout = 5 * TIMEOUT; -static unsigned short sendblock; /* block count used by sendtftp() */ -static struct tftphdr *sdp; /* data buffer used by sendtftp() */ -static struct tftphdr *sap; /* ack buffer used by sendtftp() */ - -static unsigned short recvblock; /* block count used by recvtftp() */ -static struct tftphdr *rdp; /* data buffer used by recvtftp() */ -static struct tftphdr *rap; /* ack buffer used by recvtftp() */ - #ifdef ENABLE_IPV6 static bool use_ipv6 = FALSE; #endif @@ -1148,6 +1140,10 @@ static void sendtftp(struct testcase *test, struct formats *pf) { int size; ssize_t n; + unsigned short sendblock; /* block count */ + struct tftphdr *sdp; /* data buffer */ + struct tftphdr *sap; /* ack buffer */ + sendblock = 1; #if defined(HAVE_ALARM) && defined(SIGALRM) mysignal(SIGALRM, timer); @@ -1216,6 +1212,10 @@ static void sendtftp(struct testcase *test, struct formats *pf) static void recvtftp(struct testcase *test, struct formats *pf) { ssize_t n, size; + unsigned short recvblock; /* block count */ + struct tftphdr *rdp; /* data buffer */ + struct tftphdr *rap; /* ack buffer */ + recvblock = 0; #if defined(HAVE_ALARM) && defined(SIGALRM) mysignal(SIGALRM, timer);