Andrew Talbot : ws2_32: Remove unneeded casts.
Alexandre Julliard
julliard at winehq.org
Fri Feb 8 06:20:00 CST 2008
Module: wine
Branch: master
Commit: e27ede40706f5214661838b89a413ed1ff6c8b7b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27ede40706f5214661838b89a413ed1ff6c8b7b
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Thu Feb 7 21:41:40 2008 +0000
ws2_32: Remove unneeded casts.
---
dlls/ws2_32/async.c | 8 ++++----
dlls/ws2_32/socket.c | 11 ++++-------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c
index b9c7457..963ed66 100644
--- a/dlls/ws2_32/async.c
+++ b/dlls/ws2_32/async.c
@@ -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;
strcpy(p, p_he->h_name); p += strlen(p) + 1;
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;
- 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)
{
@@ -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;
strcpy(p, p_pe->p_name); p += strlen(p) + 1;
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)
{
@@ -630,7 +630,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name,
LPSTR sbuf, INT buflen)
{
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,
AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETHOST));
}
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 5d6eee3..fb6a20d 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1670,8 +1670,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
return SOCKET_ERROR;
convert_sockopt(&level, &optname);
- if (getsockopt(fd,(int) level, optname, optval,
- (unsigned int *)optlen) != 0 )
+ if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 )
{
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
ret = SOCKET_ERROR;
@@ -1792,7 +1791,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
return SOCKET_ERROR;
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());
ret = SOCKET_ERROR;
@@ -1886,8 +1885,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
return SOCKET_ERROR;
convert_sockopt(&level, &optname);
- if (getsockopt(fd,(int) level, optname, optval,
- (unsigned int *)optlen) != 0 )
+ if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 )
{
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
ret = SOCKET_ERROR;
@@ -1915,8 +1913,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
return SOCKET_ERROR;
convert_sockopt(&level, &optname);
- if (getsockopt(fd,(int) level, optname, optval,
- (unsigned int *)optlen) != 0 )
+ if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 )
{
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
ret = SOCKET_ERROR;
More information about the wine-cvs
mailing list