archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* win32/win32.c (overlapped_socket_io): avoid warnings.

Browse source 
* thread_win32.c (ubf_handle): refactoring.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-07-24 07:05:49 +00:00
parent f8f7f884c1
commit f92478c0fb
3 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
win32/win32.c
View file

@ -2448,6 +2448,7 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
});
}
else {
DWORD size;
wbuf.len = len;
wbuf.buf = buf;
memset(&wol, 0, sizeof(wol));
@ -2456,29 +2457,33 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
if (input) {
flg = flags;
if (addr && addrlen)
ret = WSARecvFrom(s, &wbuf, 1, &r, &flg, addr, addrlen, &wol,
NULL);
ret = WSARecvFrom(s, &wbuf, 1, &size, &flg, addr, addrlen,
&wol, NULL);
else
ret = WSARecv(s, &wbuf, 1, &r, &flg, &wol, NULL);
ret = WSARecv(s, &wbuf, 1, &size, &flg, &wol, NULL);
}
else {
if (addr && addrlen)
ret = WSASendTo(s, &wbuf, 1, &r, flags, addr, *addrlen, &wol,
NULL);
ret = WSASendTo(s, &wbuf, 1, &size, flags, addr, *addrlen,
&wol, NULL);
else
ret = WSASend(s, &wbuf, 1, &r, flags, &wol, NULL);
ret = WSASend(s, &wbuf, 1, &size, flags, &wol, NULL);
}
err = WSAGetLastError();
});
if (ret == SOCKET_ERROR && err == WSA_IO_PENDING) {
if (ret != SOCKET_ERROR) {
r = size;
}
else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) {
case WAIT_OBJECT_0:
RUBY_CRITICAL(
ret = WSAGetOverlappedResult(s, &wol, &r, TRUE, &flg)
ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg)
);
if (ret)
if (ret) {
r = size;
break;
}
/* thru */
default:
errno = map_errno(err);
@ -2490,7 +2495,7 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
break;
}
}
else if (ret == SOCKET_ERROR) {
else {
errno = map_errno(err);
r = -1;
}