Hans Leidekker : dnsapi:
Use the proper type for the return value in dns_do_query_netbios().
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Sep 14 10:10:05 CDT 2006
Module: wine
Branch: master
Commit: a9a04fb386b0c8e074be1a60780e5b1ee9e2daf3
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9a04fb386b0c8e074be1a60780e5b1ee9e2daf3
Author: Hans Leidekker <hans at it.vu.nl>
Date: Wed Sep 13 14:36:49 2006 +0200
dnsapi: Use the proper type for the return value in dns_do_query_netbios().
Remove some unnecessary casts.
---
dlls/dnsapi/query.c | 11 ++++++-----
dlls/dnsapi/record.c | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
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 @@ static DNS_STATUS dns_do_query_netbios(
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 @@ static DNS_STATUS dns_do_query_netbios(
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 @@ static DNS_STATUS dns_do_query_netbios(
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 @@ static DNS_STATUS dns_do_query_netbios(
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 @@ #ifdef HAVE_RESOLV
LOCK_RESOLVER();
res_init();
- ret = dns_get_serverlist( (IP4_ARRAY *)buffer, len );
+ ret = dns_get_serverlist( buffer, len );
UNLOCK_RESOLVER();
break;
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 @@ #undef X
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 );
}
/******************************************************************************
More information about the wine-cvs
mailing list