Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
7d9b45b4
Commit
7d9b45b4
authored
Apr 24, 2014
by
antirez
Browse files
While ANET_ERR is -1, check syscall retval for -1 itself.
parent
e3cf812c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/anet.c
View file @
7d9b45b4
...
@@ -496,7 +496,7 @@ int anetTcpAccept(char *err, int s, char *ip, size_t ip_len, int *port) {
...
@@ -496,7 +496,7 @@ int anetTcpAccept(char *err, int s, char *ip, size_t ip_len, int *port) {
int
fd
;
int
fd
;
struct
sockaddr_storage
sa
;
struct
sockaddr_storage
sa
;
socklen_t
salen
=
sizeof
(
sa
);
socklen_t
salen
=
sizeof
(
sa
);
if
((
fd
=
anetGenericAccept
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
&
salen
))
==
ANET_ERR
)
if
((
fd
=
anetGenericAccept
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
&
salen
))
==
-
1
)
return
ANET_ERR
;
return
ANET_ERR
;
if
(
sa
.
ss_family
==
AF_INET
)
{
if
(
sa
.
ss_family
==
AF_INET
)
{
...
@@ -515,7 +515,7 @@ int anetUnixAccept(char *err, int s) {
...
@@ -515,7 +515,7 @@ int anetUnixAccept(char *err, int s) {
int
fd
;
int
fd
;
struct
sockaddr_un
sa
;
struct
sockaddr_un
sa
;
socklen_t
salen
=
sizeof
(
sa
);
socklen_t
salen
=
sizeof
(
sa
);
if
((
fd
=
anetGenericAccept
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
&
salen
))
==
ANET_ERR
)
if
((
fd
=
anetGenericAccept
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
&
salen
))
==
-
1
)
return
ANET_ERR
;
return
ANET_ERR
;
return
fd
;
return
fd
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment