Commit 87f94202 authored by Alexandre Julliard's avatar Alexandre Julliard

dnsapi: Make type_to_str() into a proper debugstr function.

parent 0b7dba8c
...@@ -119,7 +119,7 @@ static inline char *strdup_ua( const char *src ) ...@@ -119,7 +119,7 @@ static inline char *strdup_ua( const char *src )
return dst; return dst;
} }
extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; extern const char *debugstr_type( unsigned short ) DECLSPEC_HIDDEN;
struct resolv_funcs struct resolv_funcs
{ {
......
...@@ -109,7 +109,7 @@ static DWORD dnsapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) ...@@ -109,7 +109,7 @@ static DWORD dnsapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen )
} }
} }
static const char *debugstr_type( unsigned short type ) const char *debugstr_type( unsigned short type )
{ {
const char *str; const char *str;
......
...@@ -110,7 +110,7 @@ static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) ...@@ -110,7 +110,7 @@ static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req)
return "(null)"; return "(null)";
return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version, return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version,
debugstr_w(req->QueryName), type_to_str(req->QueryType), debugstr_w(req->QueryName), debugstr_type(req->QueryType),
(UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList, (UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList,
req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext); req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext);
} }
...@@ -136,7 +136,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server ...@@ -136,7 +136,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server
DNS_RECORDW *resultW; DNS_RECORDW *resultW;
DNS_STATUS status; DNS_STATUS status;
TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ),
options, servers, result, reserved ); options, servers, result, reserved );
if (!name || !result) if (!name || !result)
...@@ -169,7 +169,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser ...@@ -169,7 +169,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser
{ {
DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED;
TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ),
options, servers, result, reserved ); options, servers, result, reserved );
if (!name || !result) if (!name || !result)
...@@ -200,7 +200,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve ...@@ -200,7 +200,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve
DNS_RECORDA *resultA; DNS_RECORDA *resultA;
DNS_STATUS status; DNS_STATUS status;
TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), type_to_str( type ), TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), debugstr_type( type ),
options, servers, result, reserved ); options, servers, result, reserved );
if (!name || !result) if (!name || !result)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
const char *type_to_str( unsigned short type ) const char *debugstr_type( unsigned short type )
{ {
switch (type) switch (type)
{ {
...@@ -91,7 +91,7 @@ const char *type_to_str( unsigned short type ) ...@@ -91,7 +91,7 @@ const char *type_to_str( unsigned short type )
X(DNS_TYPE_WINS) X(DNS_TYPE_WINS)
X(DNS_TYPE_WINSR) X(DNS_TYPE_WINSR)
#undef X #undef X
default: { static char tmp[7]; sprintf( tmp, "0x%04x", type ); return tmp; } default: return wine_dbg_sprintf( "0x%04x", type );
} }
} }
...@@ -339,7 +339,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) ...@@ -339,7 +339,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 )
break; break;
} }
default: default:
FIXME( "unknown type: %s\n", type_to_str( r1->wType ) ); FIXME( "unknown type: %s\n", debugstr_type( r1->wType ) );
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment