marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Remove some unnecessary casts.
oldstable
Hans Leidekker 2006-09-13 14:36:49 +02:00 committed by Alexandre Julliard
parent 0c0d190376
commit a9a04fb386
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/dnsapi/query.c
View File

@ -485,6 +485,7 @@ static DNS_STATUS dns_do_query_netbios( PCSTR name, DNS_RECORDA **recp )
FIND_NAME_HEADER *header; FIND_NAME_HEADER *header;
DNS_RECORDA *record = NULL; DNS_RECORDA *record = NULL;
unsigned int i, len; unsigned int i, len;
DNS_STATUS status = ERROR_INVALID_NAME;
len = strlen( name ); len = strlen( name );
if (len >= NCBNAMSZ) return DNS_ERROR_RCODE_NAME_ERROR; if (len >= NCBNAMSZ) return DNS_ERROR_RCODE_NAME_ERROR;
@ -509,7 +510,7 @@ static DNS_STATUS dns_do_query_netbios( PCSTR name, DNS_RECORDA **recp )
record = dns_zero_alloc( sizeof(DNS_RECORDA) ); record = dns_zero_alloc( sizeof(DNS_RECORDA) );
if (!record) if (!record)
{ {
ret = ERROR_NOT_ENOUGH_MEMORY; status = ERROR_NOT_ENOUGH_MEMORY;
goto exit; goto exit;
} }
else else
@ -517,7 +518,7 @@ static DNS_STATUS dns_do_query_netbios( PCSTR name, DNS_RECORDA **recp )
record->pName = dns_strdup_u( name ); record->pName = dns_strdup_u( name );
if (!record->pName) if (!record->pName)
{ {
ret = ERROR_NOT_ENOUGH_MEMORY; status = ERROR_NOT_ENOUGH_MEMORY;
goto exit; goto exit;
} }
@ -536,12 +537,12 @@ static DNS_STATUS dns_do_query_netbios( PCSTR name, DNS_RECORDA **recp )
exit: exit:
DNS_RRSET_TERMINATE( rrset ); DNS_RRSET_TERMINATE( rrset );
if (ret != ERROR_SUCCESS) if (status != ERROR_SUCCESS)
DnsRecordListFree( rrset.pFirstRR, DnsFreeRecordList ); DnsRecordListFree( rrset.pFirstRR, DnsFreeRecordList );
else else
*recp = (DNS_RECORDA *)rrset.pFirstRR; *recp = (DNS_RECORDA *)rrset.pFirstRR;
return ret; return status;
} }
/* The resolver lock must be held and res_init() must have been /* The resolver lock must be held and res_init() must have been
@ -816,7 +817,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PWSTR adap
LOCK_RESOLVER(); LOCK_RESOLVER();
res_init(); res_init();
ret = dns_get_serverlist( (IP4_ARRAY *)buffer, len ); ret = dns_get_serverlist( buffer, len );
UNLOCK_RESOLVER(); UNLOCK_RESOLVER();
break; break;

4
dlls/dnsapi/record.c
View File

@ -115,9 +115,9 @@ const char *dns_type_to_str( unsigned short type )
static int dns_strcmpX( LPCVOID str1, LPCVOID str2, BOOL wide ) static int dns_strcmpX( LPCVOID str1, LPCVOID str2, BOOL wide )
{ {
if (wide) if (wide)
return lstrcmpiW( (LPCWSTR)str1, (LPCWSTR)str2 ); return lstrcmpiW( str1, str2 );
else else
return lstrcmpiA( (LPCSTR)str1, (LPCSTR)str2 ); return lstrcmpiA( str1, str2 );
} }
/****************************************************************************** /******************************************************************************