commit a9a04fb386b0c8e074be1a60780e5b1ee9e2daf3
author Hans Leidekker <hans@it.vu.nl> Wed Sep 13 14:36:49 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Thu Sep 14 11:11:57 2006 +0200
tree f1800b26d0a527cb105b1500fb92fd47340ef580
parent 0c0d1903761c37b9da0bebf5b8712a08e86fa9cd

dnsapi: Use the proper type for the return value in dns_do_query_netbios().

Remove some unnecessary casts.

dlls/dnsapi/query.c

diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c
index 975e77d..836255c 100644
--- a/dlls/dnsapi/query.c
+++ b/dlls/dnsapi/query.c
@@ -485,6 +485,7 @@
     FIND_NAME_HEADER *header;
     DNS_RECORDA *record = NULL;
     unsigned int i, len;
+    DNS_STATUS status = ERROR_INVALID_NAME;
 
     len = strlen( name );
     if (len >= NCBNAMSZ) return DNS_ERROR_RCODE_NAME_ERROR;
@@ -509,7 +510,7 @@
         record = dns_zero_alloc( sizeof(DNS_RECORDA) );
         if (!record)
         {
-            ret = ERROR_NOT_ENOUGH_MEMORY;
+            status = ERROR_NOT_ENOUGH_MEMORY;
             goto exit;
         }
         else
@@ -517,7 +518,7 @@
             record->pName = dns_strdup_u( name );
             if (!record->pName)
             {
-                ret = ERROR_NOT_ENOUGH_MEMORY;
+                status = ERROR_NOT_ENOUGH_MEMORY;
                 goto exit;
             }
 
@@ -536,12 +537,12 @@
 exit:
     DNS_RRSET_TERMINATE( rrset );
 
-    if (ret != ERROR_SUCCESS)
+    if (status != ERROR_SUCCESS)
         DnsRecordListFree( rrset.pFirstRR, DnsFreeRecordList );
     else
         *recp = (DNS_RECORDA *)rrset.pFirstRR;
 
-    return ret;
+    return status;
 }
 
 /*  The resolver lock must be held and res_init() must have been
@@ -816,7 +817,7 @@
         LOCK_RESOLVER();
 
         res_init();
-        ret = dns_get_serverlist( (IP4_ARRAY *)buffer, len );
+        ret = dns_get_serverlist( buffer, len );
 
         UNLOCK_RESOLVER();
         break;

dlls/dnsapi/record.c

diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
index 0c34697..eaba46a 100644
--- a/dlls/dnsapi/record.c
+++ b/dlls/dnsapi/record.c
@@ -115,9 +115,9 @@
 static int dns_strcmpX( LPCVOID str1, LPCVOID str2, BOOL wide )
 {
     if (wide)
-        return lstrcmpiW( (LPCWSTR)str1, (LPCWSTR)str2 );
+        return lstrcmpiW( str1, str2 );
     else
-        return lstrcmpiA( (LPCSTR)str1, (LPCSTR)str2 );
+        return lstrcmpiA( str1, str2 );
 }
 
 /******************************************************************************