luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warnless: remove curlx_sktosi and curlx_sitosk

Browse Source 
They were only used by test server code. Use plain old typecasts there.

Closes #15153
This commit is contained in:
Daniel Stenberg 2024-10-04 22:32:04 +02:00
parent 57cc523378
commit e9eda865df
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/warnless.c
View File

@ -345,28 +345,6 @@ size_t curlx_sitouz(int sinum)
#endif
}
#ifdef USE_WINSOCK
/*
** curl_socket_t to signed int
*/
int curlx_sktosi(curl_socket_t s)
{
return (int)((ssize_t) s);
}
/*
** signed int to curl_socket_t
*/
curl_socket_t curlx_sitosk(int i)
{
return (curl_socket_t)((ssize_t) i);
}
#endif /* USE_WINSOCK */
#if defined(_WIN32)
ssize_t curlx_read(int fd, void *buf, size_t count)

8
lib/warnless.h
View File

@ -61,14 +61,6 @@ unsigned short curlx_uitous(unsigned int uinum);
size_t curlx_sitouz(int sinum);
#ifdef USE_WINSOCK
int curlx_sktosi(curl_socket_t s);
curl_socket_t curlx_sitosk(int i);
#endif /* USE_WINSOCK */
#if defined(_WIN32)
ssize_t curlx_read(int fd, void *buf, size_t count);

4
tests/server/sockfilt.c
View File

@ -691,7 +691,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
nth = 0; /* number of internal waiting threads */
nws = 0; /* number of handled Winsock sockets */
for(fd = 0; fd < nfds; fd++) {
wsasock = curlx_sitosk(fd);
wsasock = (curl_socket_t)fd;
wsaevents.lNetworkEvents = 0;
handles[nfd] = 0;
@ -818,7 +818,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
for(i = 0; i < nfd; i++) {
fd = data[i].fd;
handle = handles[i];
wsasock = curlx_sitosk(fd);
wsasock = (curl_socket_t)fd;
/* check if the current internal handle was triggered */
if(wait != WAIT_FAILED && (wait - WAIT_OBJECT_0) <= i &&