aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-01-09 13:03:53 +0100
committerYang Tse <yangsita@gmail.com>2013-01-09 22:23:49 +0100
commita9ca5e61e533def9e430597e36d70e96aee8e27a (patch)
treeb0692fde66d6fe9c3ae9c2ef4e6c203bc05d8fbb /tests
parent06558695d5fc8f41c3d3e6f79e467ac9a987349a (diff)
sockfilt.c: fix some W64 compiler warnings
Diffstat (limited to 'tests')
-rw-r--r--tests/server/sockfilt.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index a2c0d4446..44d2a0167 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -104,6 +104,7 @@
#include "inet_pton.h"
#include "util.h"
#include "server_sockaddr.h"
+#include "warnless.h"
/* include memdebug.h last */
#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 */
if(networkevents) {
- fdarr[nfd] = (curl_socket_t) LongToHandle(fds);
+ fdarr[nfd] = curlx_sitosk(fds);
if(fds == fileno(stdin)) {
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);
if(error != SOCKET_ERROR) {
handles[nfd] = wsaevent;
- wsasocks[wsa] = (curl_socket_t) LongToHandle(fds);
+ wsasocks[wsa] = curlx_sitosk(fds);
wsaevents[wsa] = wsaevent;
wsa++;
}
else {
- handles[nfd] = LongToHandle(fds);
+ handles[nfd] = (HANDLE) curlx_sitosk(fds);
WSACloseEvent(wsaevent);
}
}
@@ -533,7 +534,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
for(idx = 0; idx < nfd; idx++) {
handle = handles[idx];
sock = fdarr[idx];
- fds = HandleToLong(sock);
+ fds = curlx_sktosi(sock);
/* check if the current internal handle was triggered */
if(wait != WAIT_FAILED && (wait - WAIT_OBJECT_0) >= idx &&