moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-01 09:51:46 -05:00
Code Issues Releases Wiki Activity

select: simplify return code handling for poll and select

Browse Source 
poll and select already return -1 on error according to POSIX,
so there is no need to perform a <0 to -1 conversion in code.

Also we can just use one check with <= 0 on the return code.

Assisted-by: Daniel Stenberg
Reviewed-by: Jay Satiro

Replaces #5852
Closes #5880
This commit is contained in:
Marc Hoersken 2020-08-28 18:21:47 +02:00
parent a935f0bdeb
commit 05729b66c5
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/select.c
View File

@ -149,15 +149,14 @@ int Curl_select(curl_socket_t maxfd, /* highest socket number */
{ {
struct timeval pending_tv; struct timeval pending_tv;
struct timeval *ptimeout; struct timeval *ptimeout;
int r;
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
/* WinSock select() can't handle zero events. See the comment below. */ /* WinSock select() can't handle zero events. See the comment below. */
if((!fds_read || fds_read->fd_count == 0) && if((!fds_read || fds_read->fd_count == 0) &&
(!fds_write || fds_write->fd_count == 0) && (!fds_write || fds_write->fd_count == 0) &&
(!fds_err || fds_err->fd_count == 0)) { (!fds_err || fds_err->fd_count == 0)) {
r = Curl_wait_ms(timeout_ms); /* no sockets, just wait */
return r; return Curl_wait_ms(timeout_ms);
} }
#endif #endif
@ -212,15 +211,13 @@ int Curl_select(curl_socket_t maxfd, /* highest socket number */
calling this an error. Luckily, with WinSock, we can _also_ ask how calling this an error. Luckily, with WinSock, we can _also_ ask how
many bits are set on an fd_set. So, let's just check it beforehand. many bits are set on an fd_set. So, let's just check it beforehand.
*/ */
r = select((int)maxfd + 1, return select((int)maxfd + 1,
fds_read && fds_read->fd_count ? fds_read : NULL, fds_read && fds_read->fd_count ? fds_read : NULL,
fds_write && fds_write->fd_count ? fds_write : NULL, fds_write && fds_write->fd_count ? fds_write : NULL,
fds_err && fds_err->fd_count ? fds_err : NULL, ptimeout); fds_err && fds_err->fd_count ? fds_err : NULL, ptimeout);
#else #else
r = select((int)maxfd + 1, fds_read, fds_write, fds_err, ptimeout); return select((int)maxfd + 1, fds_read, fds_write, fds_err, ptimeout);
#endif #endif
return r;
} }
/* /*
@ -255,8 +252,7 @@ int Curl_socket_check(curl_socket_t readfd0, /* two sockets to read from */
if((readfd0 == CURL_SOCKET_BAD) && (readfd1 == CURL_SOCKET_BAD) && if((readfd0 == CURL_SOCKET_BAD) && (readfd1 == CURL_SOCKET_BAD) &&
(writefd == CURL_SOCKET_BAD)) { (writefd == CURL_SOCKET_BAD)) {
/* no sockets, just wait */ /* no sockets, just wait */
r = Curl_wait_ms(timeout_ms); return Curl_wait_ms(timeout_ms);
return r;
} }
/* Avoid initial timestamp, avoid Curl_now() call, when elapsed /* Avoid initial timestamp, avoid Curl_now() call, when elapsed
@ -351,8 +347,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
} }
if(fds_none) { if(fds_none) {
/* no sockets, just wait */ /* no sockets, just wait */
r = Curl_wait_ms(timeout_ms); return Curl_wait_ms(timeout_ms);
return r;
} }
/* Avoid initial timestamp, avoid Curl_now() call, when elapsed /* Avoid initial timestamp, avoid Curl_now() call, when elapsed
@ -374,11 +369,8 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
else else
pending_ms = 0; pending_ms = 0;
r = poll(ufds, nfds, pending_ms); r = poll(ufds, nfds, pending_ms);
if(r <= 0)
if(r < 0) return r;
return -1;
if(r == 0)
return 0;
for(i = 0; i < nfds; i++) { for(i = 0; i < nfds; i++) {
if(ufds[i].fd == CURL_SOCKET_BAD) if(ufds[i].fd == CURL_SOCKET_BAD)
@ -421,11 +413,8 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
value). value).
*/ */
r = Curl_select(maxfd, &fds_read, &fds_write, &fds_err, timeout_ms); r = Curl_select(maxfd, &fds_read, &fds_write, &fds_err, timeout_ms);
if(r <= 0)
if(r < 0) return r;
return -1;
if(r == 0)
return 0;
r = 0; r = 0;
for(i = 0; i < nfds; i++) { for(i = 0; i < nfds; i++) {