nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 03:53:01 -05:00
Code Issues Projects Releases Wiki Activity

Another warning fix and cosmetic tweakage.

Browse Source 
[originally from svn r8665]
This commit is contained in:
Jacob Nevins 2009-09-27 16:07:10 +00:00
parent a83a9cc2a3
commit 53e2b1f865
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
windows/winnet.c
View File

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