mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-17 14:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modified the VALID_SOCK() macro to become VERIFY_SOCK() instead. It is slighly

Browse Source 
more involved, but should hopefully not generate any compiler warnings on
win32 systems (that can't check the socket based on the numeric).
This commit is contained in:
Daniel Stenberg 2005-03-21 22:34:07 +00:00
parent 3e5a32671c
commit 8817779f23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/select.c
View File

@ -51,9 +51,15 @@
#include "select.h"
#ifdef WIN32
#define VALID_SOCK(s) (1) /* Win-sockets are not in range [0..FD_SETSIZE> */
#define VERIFY_SOCK(x) /* Win-sockets are not in range [0..FD_SETSIZE> */
#else
#define VALID_SOCK(s) (((s) >= 0) && ((s) < FD_SETSIZE))
#define VERIFY_SOCK(x) do { \
if(!VALID_SOCK(x)) { \
errno = EINVAL; \
return -1; \
} \
} while(0)
#endif
/*
@ -129,10 +135,7 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
FD_ZERO(&fds_read);
if (readfd != CURL_SOCKET_BAD) {
if (!VALID_SOCK(readfd)) {
errno = EINVAL;
return -1;
}
VERIFY_SOCK(readfd);
FD_SET(readfd, &fds_read);
FD_SET(readfd, &fds_err);
maxfd = readfd;
@ -140,13 +143,10 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
FD_ZERO(&fds_write);
if (writefd != CURL_SOCKET_BAD) {
if (!VALID_SOCK(writefd)) {
errno = EINVAL;
return -1;
}
VERIFY_SOCK(writefd);
FD_SET(writefd, &fds_write);
FD_SET(writefd, &fds_err);
if (writefd > maxfd)
if (writefd > maxfd)s
maxfd = writefd;
}