From 7e480357abf2ccc4e629eff991e2632341ddda14 Mon Sep 17 00:00:00 2001
From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 27 Sep 2009 16:07:10 +0000
Subject: [PATCH 1/1] Another warning fix and cosmetic tweakage.

git-svn-id: svn://svn.tartarus.org/sgt/putty@8665 cda61777-01e9-0310-a592-d414129be87e
---
 windows/winnet.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/windows/winnet.c b/windows/winnet.c
index db5f54e7..061f72b1 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -429,10 +429,8 @@ SockAddr sk_namelookup(const char *host, char **canonicalname,
 {
     SockAddr ret = snew(struct SockAddr_tag);
     unsigned long a;
-    struct hostent *h = NULL;
     char realhost[8192];
     int hint_family;
-    int err;
 
     /* Default to IPv4. */
     hint_family = (address_family == ADDRTYPE_IPV4 ? AF_INET :
@@ -452,6 +450,8 @@ SockAddr sk_namelookup(const char *host, char **canonicalname,
     *realhost = '\0';
 
     if ((a = p_inet_addr(host)) == (unsigned long) INADDR_NONE) {
+	struct hostent *h = NULL;
+	int err;
 #ifndef NO_IPV6
 	/*
 	 * Use getaddrinfo when it's available
@@ -585,8 +585,10 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen)
 #ifndef NO_IPV6
     if (step.ai) {
 	if (p_WSAAddressToStringA) {
+	    DWORD dwbuflen;
 	    p_WSAAddressToStringA(step.ai->ai_addr, step.ai->ai_addrlen,
-				  NULL, buf, &buflen);
+				  NULL, buf, &dwbuflen);
+	    buflen = dwbuflen;
 	} else
 	    strncpy(buf, "IPv6", buflen);
     } else
-- 
2.11.0