From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 7E08F3857C4D; Tue, 18 Jan 2022 10:32:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E08F3857C4D Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: resolver: A little more consistency in debug messages X-Act-Checkin: newlib-cygwin X-Git-Author: Anton Lavrentiev via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: 3baaf083242cd314f0fd173a6ea0475a3403a50c X-Git-Newrev: 90947659b0b0de783874abf4143099cc71a54308 Message-Id: <20220118103225.7E08F3857C4D@sourceware.org> Date: Tue, 18 Jan 2022 10:32:25 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 10:32:25 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D90947659b0b= 0de783874abf4143099cc71a54308 commit 90947659b0b0de783874abf4143099cc71a54308 Author: Anton Lavrentiev via Cygwin-patches Date: Mon Jan 17 13:03:13 2022 -0500 Cygwin: resolver: A little more consistency in debug messages Diff: --- winsup/cygwin/libc/minires-os-if.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/libc/minires-os-if.c b/winsup/cygwin/libc/minire= s-os-if.c index f71178b96..6b4c5e33e 100644 --- a/winsup/cygwin/libc/minires-os-if.c +++ b/winsup/cygwin/libc/minires-os-if.c @@ -165,7 +165,7 @@ static unsigned char * write_record(unsigned char * ptr= , PDNS_RECORD rr, default: { unsigned int len =3D 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 <=3D EndPtr) memcpy(ptr, (char *) &rr->Data, len); ptr +=3D len; @@ -210,7 +210,7 @@ static int cygwin_query(res_state statp, const char * D= omName, int Class, int Ty #define NO_DATA 4 /* Valid name, no data record of requested type */ #endif =20 - DPRINTF(debug, "DnsQuery: %u (Windows)\n", res); + DPRINTF(debug, "DnsQuery for \"%s\" %d: %u (Windows)\n", DomName, Type, = res); if (res) { switch (res) { case ERROR_INVALID_NAME: @@ -236,7 +236,7 @@ static int cygwin_query(res_state statp, const char * D= omName, int Class, int Ty statp->res_h_errno =3D NO_DATA; break; default: - DPRINTF(debug, "Unknown code %u for %s %d\n", res, DomName, Type); + DPRINTF(debug, "Unknown code %u\n", res); statp->res_h_errno =3D NO_RECOVERY; break; } @@ -274,7 +274,7 @@ static int cygwin_query(res_state statp, const char * D= omName, int Class, int Ty =20 /* Check the records are in correct section order */ 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; } section =3D rr->Flags.DW & 0x3; @@ -324,7 +324,7 @@ static void get_registry_dns_items(PUNICODE_STRING in, = res_state statp, srch++); *srch++ =3D 0; 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 =3D cygwin_inet_addr((= char *) ap); if ( statp->nsaddr_list[numAddresses].sin_addr.s_addr !=3D 0 ) numAddresses++; @@ -355,7 +355,7 @@ static void get_registry_dns(res_state statp) NTSTATUS status; const PCWSTR keyName =3D L"Tcpip\\Parameters"; =20 - DPRINTF(statp->options & RES_DEBUG, "key %ls\n", keyName); + DPRINTF(statp->options & RES_DEBUG, "key \"%ls\"\n", keyName); status =3D RtlCheckRegistryKey (RTL_REGISTRY_SERVICES, keyName); if (!NT_SUCCESS (status)) { @@ -460,7 +460,7 @@ void get_dns_info(res_state statp) pIPAddr; pIPAddr =3D pIPAddr->Next) { 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 =3D cygwin_inet_add= r(pIPAddr->IpAddress.String); if (statp->nsaddr_list[numAddresses].sin_addr.s_addr !=3D 0) { numAddresses++;