Skip to content

W
wine-winehq
Commit e27ede40 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard
Browse files
Options

ws2_32: Remove unneeded casts.

parent 49665fa3
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 11 deletions
dlls/ws2_32/async.c
View file @ e27ede40
...@@ -215,9 +215,9 @@ static int WS_copy_he(char *p_to,char *p_base,int t_size,struct hostent* p_he, i ...@@ -215,9 +215,9 @@ static int WS_copy_he(char *p_to,char *p_base,int t_size,struct hostent* p_he, i
p_name = p; p_name = p;
strcpy(p, p_he->h_name); p += strlen(p) + 1; strcpy(p, p_he->h_name); p += strlen(p) + 1;
p_aliases = p; p_aliases = p;
p += list_dup(p_he->h_aliases, p, p_base + (p - (char*)p_to), 0); p += list_dup(p_he->h_aliases, p, p_base + (p - p_to), 0);
p_addr = p; p_addr = p;
list_dup(p_he->h_addr_list, p, p_base + (p - (char*)p_to), p_he->h_length); list_dup(p_he->h_addr_list, p, p_base + (p - p_to), p_he->h_length);
if (flag & AQ_WIN16) if (flag & AQ_WIN16)
{ {
...@@ -273,7 +273,7 @@ static int WS_copy_pe(char *p_to,char *p_base,int t_size,struct protoent* p_pe, ...@@ -273,7 +273,7 @@ static int WS_copy_pe(char *p_to,char *p_base,int t_size,struct protoent* p_pe,
p_name = p; p_name = p;
strcpy(p, p_pe->p_name); p += strlen(p) + 1; strcpy(p, p_pe->p_name); p += strlen(p) + 1;
p_aliases = p; p_aliases = p;
list_dup(p_pe->p_aliases, p, p_base + (p - (char*)p_to), 0); list_dup(p_pe->p_aliases, p, p_base + (p - p_to), 0);
if (flag & AQ_WIN16) if (flag & AQ_WIN16)
{ {
...@@ -630,7 +630,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, ...@@ -630,7 +630,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name,
LPSTR sbuf, INT buflen) LPSTR sbuf, INT buflen)
{ {
TRACE("hwnd %p, msg %08x, host %s, buffer %i\n", TRACE("hwnd %p, msg %08x, host %s, buffer %i\n",
hWnd, uMsg, (name)?name:"<null>", (int)buflen ); hWnd, uMsg, (name)?name:"<null>", buflen );
return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen,
AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETHOST)); AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETHOST));
} }
......
dlls/ws2_32/socket.c
View file @ e27ede40
...@@ -1670,8 +1670,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, ...@@ -1670,8 +1670,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
if ( (fd = get_sock_fd( s, 0, NULL )) == -1) if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
return SOCKET_ERROR; return SOCKET_ERROR;
convert_sockopt(&level, &optname); convert_sockopt(&level, &optname);
if (getsockopt(fd,(int) level, optname, optval, if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 )
(unsigned int *)optlen) != 0 )
{ {
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
ret = SOCKET_ERROR; ret = SOCKET_ERROR;
...@@ -1792,7 +1791,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, ...@@ -1792,7 +1791,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
return SOCKET_ERROR; return SOCKET_ERROR;
convert_sockopt(&level, &optname); convert_sockopt(&level, &optname);
if (getsockopt(fd,(int) level, optname, &tv, &len) != 0 ) if (getsockopt(fd, level, optname, &tv, &len) != 0 )
{ {
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
ret = SOCKET_ERROR; ret = SOCKET_ERROR;
...@@ -1886,8 +1885,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, ...@@ -1886,8 +1885,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
if ( (fd = get_sock_fd( s, 0, NULL )) == -1) if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
return SOCKET_ERROR; return SOCKET_ERROR;
convert_sockopt(&level, &optname); convert_sockopt(&level, &optname);
if (getsockopt(fd,(int) level, optname, optval, if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 )
(unsigned int *)optlen) != 0 )
{ {
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
ret = SOCKET_ERROR; ret = SOCKET_ERROR;
...@@ -1915,8 +1913,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, ...@@ -1915,8 +1913,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
if ( (fd = get_sock_fd( s, 0, NULL )) == -1) if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
return SOCKET_ERROR; return SOCKET_ERROR;
convert_sockopt(&level, &optname); convert_sockopt(&level, &optname);
if (getsockopt(fd,(int) level, optname, optval, if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 )
(unsigned int *)optlen) != 0 )
{ {
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
ret = SOCKET_ERROR; ret = SOCKET_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