moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

select: convert Curl_select() to private static function

Browse Source 
The old function should not be used anywhere anymore (the only remaining
gskit use has to be fixed to instead use Curl_poll or none at all).

The static function version is now called our_select() and is only built
if necessary.

Closes #6531
This commit is contained in:
Daniel Stenberg 2021-01-26 09:32:49 +01:00
parent 5ad377718d
commit 32766cb4db
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/select.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -130,6 +130,7 @@ int Curl_wait_ms(timediff_t timeout_ms)
return r; return r;
} }
#ifndef HAVE_POLL_FINE
/* /*
* This is a wrapper around select() to aid in Windows compatibility. * This is a wrapper around select() to aid in Windows compatibility.
* A negative timeout value makes this function wait indefinitely, * A negative timeout value makes this function wait indefinitely,
@ -141,11 +142,11 @@ int Curl_wait_ms(timediff_t timeout_ms)
* 0 = timeout * 0 = timeout
* N = number of signalled file descriptors * N = number of signalled file descriptors
*/ */
int Curl_select(curl_socket_t maxfd, /* highest socket number */ static int our_select(curl_socket_t maxfd, /* highest socket number */
fd_set *fds_read, /* sockets ready for reading */ fd_set *fds_read, /* sockets ready for reading */
fd_set *fds_write, /* sockets ready for writing */ fd_set *fds_write, /* sockets ready for writing */
fd_set *fds_err, /* sockets with errors */ fd_set *fds_err, /* sockets with errors */
timediff_t timeout_ms) /* milliseconds to wait */ timediff_t timeout_ms) /* milliseconds to wait */
{ {
struct timeval pending_tv; struct timeval pending_tv;
struct timeval *ptimeout; struct timeval *ptimeout;
@ -220,6 +221,8 @@ int Curl_select(curl_socket_t maxfd, /* highest socket number */
#endif #endif
} }
#endif
/* /*
* Wait for read or write events on a set of file descriptors. It uses poll() * Wait for read or write events on a set of file descriptors. It uses poll()
* when a fine poll() is available, in order to avoid limits with FD_SETSIZE, * when a fine poll() is available, in order to avoid limits with FD_SETSIZE,
@ -412,7 +415,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
curl_socket_t is unsigned in such cases and thus -1 is the largest curl_socket_t is unsigned in such cases and thus -1 is the largest
value). value).
*/ */
r = Curl_select(maxfd, &fds_read, &fds_write, &fds_err, timeout_ms); r = our_select(maxfd, &fds_read, &fds_write, &fds_err, timeout_ms);
if(r <= 0) if(r <= 0)
return r; return r;

8
lib/select.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -72,12 +72,6 @@ struct pollfd
therefore defined here */ therefore defined here */
#define CURL_CSELECT_IN2 (CURL_CSELECT_ERR << 1) #define CURL_CSELECT_IN2 (CURL_CSELECT_ERR << 1)
int Curl_select(curl_socket_t maxfd,
fd_set *fds_read,
fd_set *fds_write,
fd_set *fds_err,
timediff_t timeout_ms);
int Curl_socket_check(curl_socket_t readfd, curl_socket_t readfd2, int Curl_socket_check(curl_socket_t readfd, curl_socket_t readfd2,
curl_socket_t writefd, curl_socket_t writefd,
timediff_t timeout_ms); timediff_t timeout_ms);