summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Stancliff <matt@genges.com>2014-02-26 17:58:46 -0500
committerantirez <antirez@gmail.com>2014-03-11 11:09:37 +0100
commit7c359449d52b2a79770348f1ebb1cf57e6d317e2 (patch)
treef389d4860e94dc1c3c9d017e1b08cf3beb156c4b
parent6766fc561e4f950edc7e9468a1a9af590663c659 (diff)
downloadredis-7c359449d52b2a79770348f1ebb1cf57e6d317e2.tar.gz
Fix return value check for anetTcpAccept
anetTcpAccept returns ANET_ERR, not AE_ERR. This isn't a physical error since both ANET_ERR and AE_ERR are -1, but better to be consistent.
-rw-r--r--src/cluster.c2
-rw-r--r--src/networking.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cluster.c b/src/cluster.c
index e4e8dbf95..6f05da85f 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -401,7 +401,7 @@ void clusterAcceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
REDIS_NOTUSED(privdata);
cfd = anetTcpAccept(server.neterr, fd, cip, sizeof(cip), &cport);
- if (cfd == AE_ERR) {
+ if (cfd == ANET_ERR) {
redisLog(REDIS_VERBOSE,"Accepting cluster node: %s", server.neterr);
return;
}
diff --git a/src/networking.c b/src/networking.c
index ba9258cf5..9e3e4a21f 100644
--- a/src/networking.c
+++ b/src/networking.c
@@ -587,7 +587,7 @@ void acceptTcpHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
REDIS_NOTUSED(privdata);
cfd = anetTcpAccept(server.neterr, fd, cip, sizeof(cip), &cport);
- if (cfd == AE_ERR) {
+ if (cfd == ANET_ERR) {
redisLog(REDIS_WARNING,"Accepting client connection: %s", server.neterr);
return;
}