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

Revert half of r10135, and re-fix properly.

Browse Source 
One of my changes in uxnet.c was outside the NO_IPV6 ifdef, and broke
compilation in the normal mode. Revert all changes in that file and
replace with a reference to the 'step' parameter in the no-IPv6
version of the SOCKADDR_FAMILY macro, so that those warnings are
squelched anyway.

[originally from svn r10136]
[r10135 == e00a004e64]
This commit is contained in:
Simon Tatham 2014-02-05 21:51:25 +00:00
parent e00a004e64
commit 0f04cab151
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
unix/uxnet.c
View File

@ -126,9 +126,12 @@ struct SockAddr_tag {
(addr)->superfamily == UNIX ? AF_UNIX : \ (addr)->superfamily == UNIX ? AF_UNIX : \
(step).ai ? (step).ai->ai_family : AF_INET) (step).ai ? (step).ai->ai_family : AF_INET)
#else #else
/* Here we gratuitously reference 'step' to avoid gcc warnings about
* 'set but not used' when compiling -DNO_IPV6 */
#define SOCKADDR_FAMILY(addr, step) \ #define SOCKADDR_FAMILY(addr, step) \
((addr)->superfamily == UNRESOLVED ? AF_UNSPEC : \ ((addr)->superfamily == UNRESOLVED ? AF_UNSPEC : \
(addr)->superfamily == UNIX ? AF_UNIX : AF_INET) (addr)->superfamily == UNIX ? AF_UNIX : \
(step).curraddr ? AF_INET : AF_INET)
#endif #endif
/* /*
@ -331,7 +334,9 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen)
} }
#else #else
struct in_addr a; struct in_addr a;
assert(SOCKADDR_FAMILY(addr, ignored_macro_parameter) == AF_INET); SockAddrStep step;
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';
@ -386,7 +391,9 @@ 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;
assert(SOCKADDR_FAMILY(addr, ignored_macro_parameter) == AF_INET); SockAddrStep step;
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
@ -400,8 +407,10 @@ int sk_address_is_special_local(SockAddr addr)
int sk_addrtype(SockAddr addr) int sk_addrtype(SockAddr addr)
{ {
SockAddrStep step;
int family; int family;
family = SOCKADDR_FAMILY(addr, ignored_macro_parameter); START_STEP(addr, step);
family = SOCKADDR_FAMILY(addr, step);
return (family == AF_INET ? ADDRTYPE_IPV4 : return (family == AF_INET ? ADDRTYPE_IPV4 :
#ifndef NO_IPV6 #ifndef NO_IPV6