Skip to content

Commit 219d429

Browse files
Proper return value for Windows Sockets 2 functions
* socket() https://docs.microsoft.com/windows/win32/api/winsock2/nf-winsock2-socket#return-value [...] a value of INVALID_SOCKET is returned [...] * setsockopt() https://docs.microsoft.com/windows/win32/api/winsock2/nf-winsock2-setsockopt#return-value [...] a value of SOCKET_ERROR is returned [...] * WSASocket() https://docs.microsoft.com//windows/win32/api/winsock2/nf-winsock2-wsasocketw#return-value [...] a value of INVALID_SOCKET is returned [...] * accept() https://docs.microsoft.com/windows/win32/api/winsock2/nf-winsock2-accept#return-value [...] a value of INVALID_SOCKET is returned [...]
1 parent bd18664 commit 219d429

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

socketpair.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ int dumb_socketpair(SOCKET socks[2], int make_overlapped)
8989
socks[0] = socks[1] = -1;
9090

9191
listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
92-
if (listener == -1)
92+
if (listener == INVALID_SOCKET)
9393
return SOCKET_ERROR;
9494

9595
memset(&a, 0, sizeof(a));
@@ -99,7 +99,7 @@ int dumb_socketpair(SOCKET socks[2], int make_overlapped)
9999

100100
for (;;) {
101101
if (setsockopt(listener, SOL_SOCKET, SO_REUSEADDR,
102-
(char*) &reuse, (socklen_t) sizeof(reuse)) == -1)
102+
(char*) &reuse, (socklen_t) sizeof(reuse)) == SOCKET_ERROR)
103103
break;
104104
if (bind(listener, &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
105105
break;
@@ -116,13 +116,13 @@ int dumb_socketpair(SOCKET socks[2], int make_overlapped)
116116
break;
117117

118118
socks[0] = WSASocket(AF_INET, SOCK_STREAM, 0, NULL, 0, flags);
119-
if (socks[0] == -1)
119+
if (socks[0] == INVALID_SOCKET)
120120
break;
121121
if (connect(socks[0], &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
122122
break;
123123

124124
socks[1] = accept(listener, NULL, NULL);
125-
if (socks[1] == -1)
125+
if (socks[1] == INVALID_SOCKET)
126126
break;
127127

128128
closesocket(listener);

0 commit comments

Comments
 (0)