From: Anton Lavrentiev <lavr@ncbi.nlm.nih.gov>
To: cygwin-patches@cygwin.com
Subject: [PATCH 6/7] Message consistency
Date: Fri, 14 Jan 2022 17:10:17 -0500 [thread overview]
Message-ID: <20220114221018.43941-7-lavr@ncbi.nlm.nih.gov> (raw)
In-Reply-To: <20220114221018.43941-1-lavr@ncbi.nlm.nih.gov>
---
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/minires-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 = 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)
memcpy(ptr, (char *) &rr->Data, 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 */
#endif
- 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 * DomName, int Class, int Ty
statp->res_h_errno = 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 = NO_RECOVERY;
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 */
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 = rr->Flags.DW & 0x3;
@@ -324,7 +324,7 @@ static void get_registry_dns_items(PUNICODE_STRING in, res_state statp,
srch++);
*srch++ = 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 = cygwin_inet_addr((char *) ap);
if ( statp->nsaddr_list[numAddresses].sin_addr.s_addr != 0 )
numAddresses++;
@@ -355,7 +355,7 @@ static void get_registry_dns(res_state statp)
NTSTATUS status;
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);
if (!NT_SUCCESS (status))
{
@@ -460,7 +460,7 @@ void get_dns_info(res_state statp)
pIPAddr;
pIPAddr = 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 = cygwin_inet_addr(pIPAddr->IpAddress.String);
if (statp->nsaddr_list[numAddresses].sin_addr.s_addr != 0) {
numAddresses++;
--
2.33.0
next prev parent reply other threads:[~2022-01-14 22:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 22:10 Cygwin: A few fixes for local resolver Anton Lavrentiev
2022-01-14 22:10 ` [PATCH 1/7] Fix format specifier for wide-char string Anton Lavrentiev
2022-01-14 22:10 ` [PATCH 2/7] Use matching format for NTSTATUS Anton Lavrentiev
2022-01-15 4:38 ` Brian Inglis
2022-01-15 19:04 ` [EXTERNAL] " Lavrentiev, Anton (NIH/NLM/NCBI) [C]
2022-01-15 22:38 ` Brian Inglis
2022-01-16 0:20 ` Lavrentiev, Anton (NIH/NLM/NCBI) [C]
2022-01-14 22:10 ` [PATCH 3/7] Debug output to show both IP and port # in native b.o., a few little cosmetic improvements for consistency Anton Lavrentiev
2022-01-17 10:39 ` Corinna Vinschen
2022-01-17 10:44 ` Corinna Vinschen
2022-01-14 22:10 ` [PATCH 4/7] Process options forward (not backwards) Anton Lavrentiev
2022-01-14 22:10 ` [PATCH 5/7] Format consitency for Windows errors Anton Lavrentiev
2022-01-14 22:10 ` Anton Lavrentiev [this message]
2022-01-14 22:10 ` [PATCH 7/7] Added processing of AAAA records Anton Lavrentiev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220114221018.43941-7-lavr@ncbi.nlm.nih.gov \
--to=lavr@ncbi.nlm.nih.gov \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).