diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
| commit | 5e34ff29bcc870936ab18172f438a34d042d4e03 (patch) | |
| tree | a5e7a528f2f916eb883f1161eadceacdf2dca4be /libbb/xconnect.c | |
| parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
| download | busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.bz2 busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.zip | |
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially
badly named. It was not skipping anything!
Diffstat (limited to 'libbb/xconnect.c')
| -rw-r--r-- | libbb/xconnect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c index f5d7983a4..1b4f4f78a 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c | |||
| @@ -151,7 +151,7 @@ void FAST_FUNC set_nport(len_and_sockaddr *lsa, unsigned port) | |||
| 151 | * port: if neither of above specifies port # */ | 151 | * port: if neither of above specifies port # */ |
| 152 | static len_and_sockaddr* str2sockaddr( | 152 | static len_and_sockaddr* str2sockaddr( |
| 153 | const char *host, int port, | 153 | const char *host, int port, |
| 154 | USE_FEATURE_IPV6(sa_family_t af,) | 154 | IF_FEATURE_IPV6(sa_family_t af,) |
| 155 | int ai_flags) | 155 | int ai_flags) |
| 156 | { | 156 | { |
| 157 | int rc; | 157 | int rc; |
| @@ -269,9 +269,9 @@ len_and_sockaddr* FAST_FUNC xdotted2sockaddr(const char *host, int port) | |||
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | #undef xsocket_type | 271 | #undef xsocket_type |
| 272 | int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int family,) int sock_type) | 272 | int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,) int sock_type) |
| 273 | { | 273 | { |
| 274 | SKIP_FEATURE_IPV6(enum { family = AF_INET };) | 274 | IF_NOT_FEATURE_IPV6(enum { family = AF_INET };) |
| 275 | len_and_sockaddr *lsa; | 275 | len_and_sockaddr *lsa; |
| 276 | int fd; | 276 | int fd; |
| 277 | int len; | 277 | int len; |
| @@ -303,7 +303,7 @@ int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int family, | |||
| 303 | 303 | ||
| 304 | int FAST_FUNC xsocket_stream(len_and_sockaddr **lsap) | 304 | int FAST_FUNC xsocket_stream(len_and_sockaddr **lsap) |
| 305 | { | 305 | { |
| 306 | return xsocket_type(lsap, USE_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM); | 306 | return xsocket_type(lsap, IF_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM); |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type) | 309 | static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type) |
| @@ -316,7 +316,7 @@ static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type) | |||
| 316 | /* user specified bind addr dictates family */ | 316 | /* user specified bind addr dictates family */ |
| 317 | fd = xsocket(lsa->u.sa.sa_family, sock_type, 0); | 317 | fd = xsocket(lsa->u.sa.sa_family, sock_type, 0); |
| 318 | } else { | 318 | } else { |
| 319 | fd = xsocket_type(&lsa, USE_FEATURE_IPV6(AF_UNSPEC,) sock_type); | 319 | fd = xsocket_type(&lsa, IF_FEATURE_IPV6(AF_UNSPEC,) sock_type); |
| 320 | set_nport(lsa, htons(port)); | 320 | set_nport(lsa, htons(port)); |
| 321 | } | 321 | } |
| 322 | setsockopt_reuseaddr(fd); | 322 | setsockopt_reuseaddr(fd); |