iphlpapi: Remove superfluous pointer casts.

[Michael Stefaniuc]

---
 dlls/iphlpapi/icmp.c          |   20 ++++++++++----------
 dlls/iphlpapi/ifenum.c        |    2 +-
 dlls/iphlpapi/iphlpapi_main.c |    8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c
index ca965fb..d9f988b 100644
--- a/dlls/iphlpapi/icmp.c
+++ b/dlls/iphlpapi/icmp.c
@@ -165,7 +165,7 @@ HANDLE WINAPI IcmpCreateFile(VOID)
     }
     icp->sid=sid;
     icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN;
-    return (HANDLE)icp;
+    return icp;
 }
 
 
@@ -174,7 +174,7 @@ HANDLE WINAPI IcmpCreateFile(VOID)
  */
 BOOL WINAPI IcmpCloseHandle(HANDLE  IcmpHandle)
 {
-    icmp_t* icp=(icmp_t*)IcmpHandle;
+    icmp_t* icp=IcmpHandle;
     if (IcmpHandle==INVALID_HANDLE_VALUE) {
         /* FIXME: in fact win98 seems to ignore the handle value !!! */
         SetLastError(ERROR_INVALID_HANDLE);
@@ -201,7 +201,7 @@ DWORD WINAPI IcmpSendEcho(
     DWORD                    Timeout
     )
 {
-    icmp_t* icp=(icmp_t*)IcmpHandle;
+    icmp_t* icp=IcmpHandle;
     unsigned char* reqbuf;
     int reqsize;
 
@@ -260,19 +260,19 @@ DWORD WINAPI IcmpSendEcho(
             unsigned int len;
             /* Before we mess with the options, get the default values */
             len=sizeof(val);
-            getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len);
+            getsockopt(icp->sid,IPPROTO_IP,IP_TTL,&val,&len);
             icp->default_opts.Ttl=val;
 
             len=sizeof(val);
-            getsockopt(icp->sid,IPPROTO_IP,IP_TOS,(char *)&val,&len);
+            getsockopt(icp->sid,IPPROTO_IP,IP_TOS,&val,&len);
             icp->default_opts.Tos=val;
             /* FIXME: missing: handling of IP 'flags', and all the other options */
         }
 
         val=RequestOptions->Ttl;
-        setsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,sizeof(val));
+        setsockopt(icp->sid,IPPROTO_IP,IP_TTL,&val,sizeof(val));
         val=RequestOptions->Tos;
-        setsockopt(icp->sid,IPPROTO_IP,IP_TOS,(char *)&val,sizeof(val));
+        setsockopt(icp->sid,IPPROTO_IP,IP_TOS,&val,sizeof(val));
         /* FIXME:  missing: handling of IP 'flags', and all the other options */
 
         icp->default_opts.OptionsSize=IP_OPTS_CUSTOM;
@@ -281,9 +281,9 @@ DWORD WINAPI IcmpSendEcho(
 
         /* Restore the default options */
         val=icp->default_opts.Ttl;
-        setsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,sizeof(val));
+        setsockopt(icp->sid,IPPROTO_IP,IP_TTL,&val,sizeof(val));
         val=icp->default_opts.Tos;
-        setsockopt(icp->sid,IPPROTO_IP,IP_TOS,(char *)&val,sizeof(val));
+        setsockopt(icp->sid,IPPROTO_IP,IP_TOS,&val,sizeof(val));
         /* FIXME: missing: handling of IP 'flags', and all the other options */
 
         icp->default_opts.OptionsSize=IP_OPTS_DEFAULT;
@@ -304,7 +304,7 @@ DWORD WINAPI IcmpSendEcho(
     TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr));
 #if 0
     if (TRACE_ON(icmp)){
-        unsigned char* buf=(unsigned char*)reqbuf;
+        unsigned char* buf=reqbuf;
         int i;
         printf("Output buffer:\n");
         for (i=0;i<reqsize;i++)
diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c
index f36fc99..d3e30e9 100644
--- a/dlls/iphlpapi/ifenum.c
+++ b/dlls/iphlpapi/ifenum.c
@@ -414,7 +414,7 @@ DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr,
       ioctl(fd, SIOCGIFADDR, &ifr);
       memset(&arp, 0, sizeof(struct arpreq));
       arp.arp_pa.sa_family = AF_INET;
-      saddr = (struct sockaddr_in *)&arp; /* proto addr is first member */
+      saddr = &arp; /* proto addr is first member */
       saddr->sin_family = AF_INET;
       memcpy(&saddr->sin_addr.s_addr, ifr.ifr_addr.sa_data + 2, sizeof(DWORD));
       if ((ioctl(fd, SIOCGARP, &arp)))
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index f580ca8..0171af6 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -194,8 +194,8 @@ static int IpForwardTableSorter(const void *a, const void *b)
   int ret;
 
   if (a && b) {
-   const MIB_IPFORWARDROW* rowA = (const MIB_IPFORWARDROW*)a;
-   const MIB_IPFORWARDROW* rowB = (const MIB_IPFORWARDROW*)b;
+   const MIB_IPFORWARDROW* rowA = a;
+   const MIB_IPFORWARDROW* rowB = b;
 
     ret = rowA->dwForwardDest - rowB->dwForwardDest;
     if (ret == 0) {
@@ -357,8 +357,8 @@ static int UdpTableSorter(const void *a, const void *b)
   int ret;
 
   if (a && b) {
-    const MIB_UDPROW* rowA = (const MIB_UDPROW*)a;
-    const MIB_UDPROW* rowB = (const MIB_UDPROW*)b;
+    const MIB_UDPROW* rowA = a;
+    const MIB_UDPROW* rowB = b;
 
     ret = rowA->dwLocalAddr - rowB->dwLocalAddr;
     if (ret == 0)
-- 
1.6.0.6
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20090202/9d691709/attachment.pgp