drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: resolver: A little more consistency in debug messages

This commit is contained in:
Anton Lavrentiev via Cygwin-patches 2022-01-17 13:03:13 -05:00 committed by Corinna Vinschen
parent 3baaf08324
commit 90947659b0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/cygwin/libc/minires-os-if.c
View File

@ -165,7 +165,7 @@ static unsigned char * write_record(unsigned char * ptr, PDNS_RECORD rr,
default: default:
{ {
unsigned int len = rr->wDataLength; unsigned int len = rr->wDataLength;
DPRINTF(debug, "No structure for wType %d\n", rr->wType); DPRINTF(debug, "No structure for wType %u\n", rr->wType);
if (ptr + len <= EndPtr) if (ptr + len <= EndPtr)
memcpy(ptr, (char *) &rr->Data, len); memcpy(ptr, (char *) &rr->Data, len);
ptr += len; ptr += len;
@ -210,7 +210,7 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
#define NO_DATA 4 /* Valid name, no data record of requested type */ #define NO_DATA 4 /* Valid name, no data record of requested type */
#endif #endif
DPRINTF(debug, "DnsQuery: %u (Windows)\n", res); DPRINTF(debug, "DnsQuery for \"%s\" %d: %u (Windows)\n", DomName, Type, res);
if (res) { if (res) {
switch (res) { switch (res) {
case ERROR_INVALID_NAME: case ERROR_INVALID_NAME:
@ -236,7 +236,7 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
statp->res_h_errno = NO_DATA; statp->res_h_errno = NO_DATA;
break; break;
default: default:
DPRINTF(debug, "Unknown code %u for %s %d\n", res, DomName, Type); DPRINTF(debug, "Unknown code %u\n", res);
statp->res_h_errno = NO_RECOVERY; statp->res_h_errno = NO_RECOVERY;
break; break;
} }
@ -274,7 +274,7 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
/* Check the records are in correct section order */ /* Check the records are in correct section order */
if ((rr->Flags.DW & 0x3) < section) { if ((rr->Flags.DW & 0x3) < section) {
DPRINTF(debug, "Unexpected section order %s %d\n", DomName, Type); DPRINTF(debug, "Unexpected section order for \"%s\" %d\n", DomName, Type);
continue; continue;
} }
section = rr->Flags.DW & 0x3; section = rr->Flags.DW & 0x3;
@ -324,7 +324,7 @@ static void get_registry_dns_items(PUNICODE_STRING in, res_state statp,
srch++); srch++);
*srch++ = 0; *srch++ = 0;
if (numAddresses < DIM(statp->nsaddr_list)) { if (numAddresses < DIM(statp->nsaddr_list)) {
DPRINTF(debug, "server \"%s\"\n", ap); DPRINTF(debug, "registry server \"%s\"\n", ap);
statp->nsaddr_list[numAddresses].sin_addr.s_addr = cygwin_inet_addr((char *) ap); statp->nsaddr_list[numAddresses].sin_addr.s_addr = cygwin_inet_addr((char *) ap);
if ( statp->nsaddr_list[numAddresses].sin_addr.s_addr != 0 ) if ( statp->nsaddr_list[numAddresses].sin_addr.s_addr != 0 )
numAddresses++; numAddresses++;
@ -355,7 +355,7 @@ static void get_registry_dns(res_state statp)
NTSTATUS status; NTSTATUS status;
const PCWSTR keyName = L"Tcpip\\Parameters"; const PCWSTR keyName = L"Tcpip\\Parameters";
DPRINTF(statp->options & RES_DEBUG, "key %ls\n", keyName); DPRINTF(statp->options & RES_DEBUG, "key \"%ls\"\n", keyName);
status = RtlCheckRegistryKey (RTL_REGISTRY_SERVICES, keyName); status = RtlCheckRegistryKey (RTL_REGISTRY_SERVICES, keyName);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
@ -460,7 +460,7 @@ void get_dns_info(res_state statp)
pIPAddr; pIPAddr;
pIPAddr = pIPAddr->Next) { pIPAddr = pIPAddr->Next) {
if (numAddresses < DIM(statp->nsaddr_list)) { if (numAddresses < DIM(statp->nsaddr_list)) {
DPRINTF(debug, "server \"%s\"\n", pIPAddr->IpAddress.String); DPRINTF(debug, "params server \"%s\"\n", pIPAddr->IpAddress.String);
statp->nsaddr_list[numAddresses].sin_addr.s_addr = cygwin_inet_addr(pIPAddr->IpAddress.String); statp->nsaddr_list[numAddresses].sin_addr.s_addr = cygwin_inet_addr(pIPAddr->IpAddress.String);
if (statp->nsaddr_list[numAddresses].sin_addr.s_addr != 0) { if (statp->nsaddr_list[numAddresses].sin_addr.s_addr != 0) {
numAddresses++; numAddresses++;