nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-03 21:52:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix warnings when compiling with -DNO_IPV6.

Browse Source 
A user pointed out that 'family' was uninitialised in config.c, and
when I tried test-building with -DNO_IPV6 (and the usual -Werror, of
course) some unused variables showed up in uxnet.c too.

[originally from svn r10135]
This commit is contained in:
Simon Tatham 2014-02-04 22:37:53 +00:00
parent c29ab648b9
commit e00a004e64
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -1127,8 +1127,8 @@ static void portfwd_handler(union control *ctrl, void *dlg,
else if (whichbutton == 2) else if (whichbutton == 2)
family = "6"; family = "6";
else else
family = "";
#endif #endif
family = "";
whichbutton = dlg_radiobutton_get(pfd->direction, dlg); whichbutton = dlg_radiobutton_get(pfd->direction, dlg);
if (whichbutton == 0) if (whichbutton == 0)

12
unix/uxnet.c
View File

@ -331,9 +331,7 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen)
} }
#else #else
struct in_addr a; struct in_addr a;
SockAddrStep step; assert(SOCKADDR_FAMILY(addr, ignored_macro_parameter) == AF_INET);
START_STEP(addr, step);
assert(SOCKADDR_FAMILY(addr, step) == AF_INET);
a.s_addr = htonl(addr->addresses[0]); a.s_addr = htonl(addr->addresses[0]);
strncpy(buf, inet_ntoa(a), buflen); strncpy(buf, inet_ntoa(a), buflen);
buf[buflen-1] = '\0'; buf[buflen-1] = '\0';
@ -388,9 +386,7 @@ int sk_address_is_local(SockAddr addr)
return sockaddr_is_loopback(addr->ais->ai_addr); return sockaddr_is_loopback(addr->ais->ai_addr);
#else #else
struct in_addr a; struct in_addr a;
SockAddrStep step; assert(SOCKADDR_FAMILY(addr, ignored_macro_parameter) == AF_INET);
START_STEP(addr, step);
assert(SOCKADDR_FAMILY(addr, step) == AF_INET);
a.s_addr = htonl(addr->addresses[0]); a.s_addr = htonl(addr->addresses[0]);
return ipv4_is_loopback(a); return ipv4_is_loopback(a);
#endif #endif
@ -404,10 +400,8 @@ int sk_address_is_special_local(SockAddr addr)
int sk_addrtype(SockAddr addr) int sk_addrtype(SockAddr addr)
{ {
SockAddrStep step;
int family; int family;
START_STEP(addr, step); family = SOCKADDR_FAMILY(addr, ignored_macro_parameter);
family = SOCKADDR_FAMILY(addr, step);
return (family == AF_INET ? ADDRTYPE_IPV4 : return (family == AF_INET ? ADDRTYPE_IPV4 :
#ifndef NO_IPV6 #ifndef NO_IPV6