Commit 92b21720 authored by Alexandre Julliard's avatar Alexandre Julliard

ws2_32: Use socklen_t where appropriate.

parent dfcf4910
...@@ -3053,7 +3053,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD ...@@ -3053,7 +3053,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
DWORD flags ) DWORD flags )
{ {
union generic_unix_sockaddr uaddr; union generic_unix_sockaddr uaddr;
unsigned int uaddrlen = sizeof(uaddr); socklen_t uaddrlen = sizeof(uaddr);
struct ws2_transmitfile_async *wsa; struct ws2_transmitfile_async *wsa;
NTSTATUS status; NTSTATUS status;
int fd; int fd;
...@@ -7720,8 +7720,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, ...@@ -7720,8 +7720,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
{ {
/* It's invalid to receive OOB data from an OOBINLINED socket /* It's invalid to receive OOB data from an OOBINLINED socket
* as OOB data is turned into normal data. */ * as OOB data is turned into normal data. */
i = sizeof(n); socklen_t len = sizeof(n);
if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &i) && n) if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &len) && n)
{ {
err = WSAEINVAL; err = WSAEINVAL;
goto error; goto error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment