moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-10-31 15:45:12 -04:00
Code Issues Releases Wiki Activity

sockfilt.c: fix some W64 compiler warnings

Browse Source
This commit is contained in:
Yang Tse 2013-01-09 13:03:53 +01:00
parent 06558695d5
commit a9ca5e61e5
3 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/warnless.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, 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
@ -378,6 +378,28 @@ size_t curlx_sitouz(int sinum)
#endif #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(__INTEL_COMPILER) && defined(__unix__) #if defined(__INTEL_COMPILER) && defined(__unix__)
int curlx_FD_ISSET(int fd, fd_set *fdset) int curlx_FD_ISSET(int fd, fd_set *fdset)

14
lib/warnless.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, 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
@ -22,6 +22,10 @@
* *
***************************************************************************/ ***************************************************************************/
#ifdef USE_WINSOCK
#include <curl/curl.h> /* for curl_socket_t */
#endif
unsigned short curlx_ultous(unsigned long ulnum); unsigned short curlx_ultous(unsigned long ulnum);
unsigned char curlx_ultouc(unsigned long ulnum); unsigned char curlx_ultouc(unsigned long ulnum);
@ -48,6 +52,14 @@ int curlx_sztosi(ssize_t sznum);
size_t curlx_sitouz(int sinum); 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(__INTEL_COMPILER) && defined(__unix__) #if defined(__INTEL_COMPILER) && defined(__unix__)
int curlx_FD_ISSET(int fd, fd_set *fdset); int curlx_FD_ISSET(int fd, fd_set *fdset);

9
tests/server/sockfilt.c
View File

@ -104,6 +104,7 @@
#include "inet_pton.h" #include "inet_pton.h"
#include "util.h" #include "util.h"
#include "server_sockaddr.h" #include "server_sockaddr.h"
#include "warnless.h"
/* include memdebug.h last */ /* include memdebug.h last */
#include "memdebug.h" #include "memdebug.h"
@ -488,7 +489,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
/* only wait for events for which we actually care */ /* only wait for events for which we actually care */
if(networkevents) { if(networkevents) {
fdarr[nfd] = (curl_socket_t) LongToHandle(fds); fdarr[nfd] = curlx_sitosk(fds);
if(fds == fileno(stdin)) { if(fds == fileno(stdin)) {
handles[nfd] = GetStdHandle(STD_INPUT_HANDLE); handles[nfd] = GetStdHandle(STD_INPUT_HANDLE);
} }
@ -504,12 +505,12 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
error = WSAEventSelect(fds, wsaevent, networkevents); error = WSAEventSelect(fds, wsaevent, networkevents);
if(error != SOCKET_ERROR) { if(error != SOCKET_ERROR) {
handles[nfd] = wsaevent; handles[nfd] = wsaevent;
wsasocks[wsa] = (curl_socket_t) LongToHandle(fds); wsasocks[wsa] = curlx_sitosk(fds);
wsaevents[wsa] = wsaevent; wsaevents[wsa] = wsaevent;
wsa++; wsa++;
} }
else { else {
handles[nfd] = LongToHandle(fds); handles[nfd] = (HANDLE) curlx_sitosk(fds);
WSACloseEvent(wsaevent); WSACloseEvent(wsaevent);
} }
} }
@ -533,7 +534,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
for(idx = 0; idx < nfd; idx++) { for(idx = 0; idx < nfd; idx++) {
handle = handles[idx]; handle = handles[idx];
sock = fdarr[idx]; sock = fdarr[idx];
fds = HandleToLong(sock); fds = curlx_sktosi(sock);
/* check if the current internal handle was triggered */ /* check if the current internal handle was triggered */
if(wait != WAIT_FAILED && (wait - WAIT_OBJECT_0) >= idx && if(wait != WAIT_FAILED && (wait - WAIT_OBJECT_0) >= idx &&