diff options
Diffstat (limited to 'otherlibs/win32unix')
| -rw-r--r-- | otherlibs/win32unix/sendrecv.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/otherlibs/win32unix/sendrecv.c b/otherlibs/win32unix/sendrecv.c index 773aa9260..7359feb58 100644 --- a/otherlibs/win32unix/sendrecv.c +++ b/otherlibs/win32unix/sendrecv.c @@ -26,6 +26,8 @@ static int msg_flag_table[] = { CAMLprim value unix_recv(value sock, value buff, value ofs, value len, value flags) { + SOCKET s = Socket_val(sock); + int flg = convert_flag_list(flags, msg_flag_table); int ret; intnat numbytes; char iobuf[UNIX_BUFFER_SIZE]; @@ -34,8 +36,7 @@ CAMLprim value unix_recv(value sock, value buff, value ofs, value len, value fla numbytes = Long_val(len); if (numbytes > UNIX_BUFFER_SIZE) numbytes = UNIX_BUFFER_SIZE; enter_blocking_section(); - ret = recv(Socket_val(sock), iobuf, (int) numbytes, - convert_flag_list(flags, msg_flag_table)); + ret = recv(s, iobuf, (int) numbytes, flg); leave_blocking_section(); if (ret == -1) { win32_maperr(WSAGetLastError()); @@ -48,6 +49,8 @@ CAMLprim value unix_recv(value sock, value buff, value ofs, value len, value fla CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value flags) { + SOCKET s = Socket_val(sock); + int flg = convert_flag_list(flags, msg_flag_table); int ret; intnat numbytes; char iobuf[UNIX_BUFFER_SIZE]; @@ -61,10 +64,7 @@ CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value if (numbytes > UNIX_BUFFER_SIZE) numbytes = UNIX_BUFFER_SIZE; addr_len = sizeof(sock_addr); enter_blocking_section(); - ret = recvfrom(Socket_val(sock), - iobuf, (int) numbytes, - convert_flag_list(flags, msg_flag_table), - &addr.s_gen, &addr_len); + ret = recvfrom(s, iobuf, (int) numbytes, flg, &addr.s_gen, &addr_len); leave_blocking_section(); if (ret == -1) { win32_maperr(WSAGetLastError()); @@ -81,6 +81,8 @@ CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value CAMLprim value unix_send(value sock, value buff, value ofs, value len, value flags) { + SOCKET s = Socket_val(sock); + int flg = convert_flag_list(flags, msg_flag_table); int ret; intnat numbytes; char iobuf[UNIX_BUFFER_SIZE]; @@ -89,8 +91,7 @@ CAMLprim value unix_send(value sock, value buff, value ofs, value len, value fla if (numbytes > UNIX_BUFFER_SIZE) numbytes = UNIX_BUFFER_SIZE; memmove (iobuf, &Byte(buff, Long_val(ofs)), numbytes); enter_blocking_section(); - ret = send(Socket_val(sock), iobuf, (int) numbytes, - convert_flag_list(flags, msg_flag_table)); + ret = send(s, iobuf, (int) numbytes, flg); leave_blocking_section(); if (ret == -1) { win32_maperr(WSAGetLastError()); @@ -101,6 +102,8 @@ CAMLprim value unix_send(value sock, value buff, value ofs, value len, value fla value unix_sendto_native(value sock, value buff, value ofs, value len, value flags, value dest) { + SOCKET s = Socket_val(sock); + int flg = convert_flag_list(flags, msg_flag_table); int ret; intnat numbytes; char iobuf[UNIX_BUFFER_SIZE]; @@ -112,10 +115,7 @@ value unix_sendto_native(value sock, value buff, value ofs, value len, value fla if (numbytes > UNIX_BUFFER_SIZE) numbytes = UNIX_BUFFER_SIZE; memmove (iobuf, &Byte(buff, Long_val(ofs)), numbytes); enter_blocking_section(); - ret = sendto(Socket_val(sock), - iobuf, (int) numbytes, - convert_flag_list(flags, msg_flag_table), - &addr.s_gen, addr_len); + ret = sendto(s, iobuf, (int) numbytes, flg, &addr.s_gen, addr_len); leave_blocking_section(); if (ret == -1) { win32_maperr(WSAGetLastError()); |