summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2013-07-10 14:37:13 +0200
committerantirez <antirez@gmail.com>2013-07-10 14:37:13 +0200
commitbd3c897e9fa86ec0e1ddd80986fc704858129897 (patch)
tree3e3b322235de4511fc5238334f71385cd5fc6610
parentd83dca4c79850cd8a271f534fa651b0c46666c6a (diff)
downloadredis-bd3c897e9fa86ec0e1ddd80986fc704858129897.tar.gz
anet.c: save some vertical space.
-rw-r--r--src/anet.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/anet.c b/src/anet.c
index 3726b9f67..257b491e9 100644
--- a/src/anet.c
+++ b/src/anet.c
@@ -237,18 +237,11 @@ static int anetTcpGenericConnect(char *err, char *addr, int port, int flags)
continue;
/* if we set err then goto cleanup, otherwise next */
- if (anetSetReuseAddr(err,s) == ANET_ERR) {
+ if (anetSetReuseAddr(err,s) == ANET_ERR) goto error;
+ if (flags & ANET_CONNECT_NONBLOCK && anetNonBlock(err,s) != ANET_OK)
goto error;
- }
- if (flags & ANET_CONNECT_NONBLOCK) {
- if (anetNonBlock(err,s) != ANET_OK)
- goto error;
- }
if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
- if (errno == EINPROGRESS &&
- flags & ANET_CONNECT_NONBLOCK)
- goto end;
-
+ if (errno == EINPROGRESS && flags & ANET_CONNECT_NONBLOCK) goto end;
close(s);
continue;
}