From fc1005e27f5ebfe1c6f5b05df68484c2f2c0e3df Mon Sep 17 00:00:00 2001 From: venom1204 Date: Tue, 4 Mar 2025 03:52:11 +0530 Subject: [PATCH 1/4] merged dtprints --- src/fread.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/fread.c b/src/fread.c index 3549d8af05..1c3ae8b045 100644 --- a/src/fread.c +++ b/src/fread.c @@ -1730,8 +1730,9 @@ int freadMain(freadMainArgs _args) { topQuoteRule = quoteRule; firstJumpEnd = ch; // to know how many bytes jump 0 is, for nrow estimate later (a less-good estimate when fill=true since line lengths vary more) if (verbose) { - DTPRINT((unsigned)sep<32 ? " sep=%#02x" : " sep='%c'", sep); // # notranslate - DTPRINT(_(" with %d fields using quote rule %d\n"), topNumFields, quoteRule); + DTPRINT((unsigned)sep<32 ? " sep=%#02x with %d fields using quote rule %d\n" + : " sep='%c' with %d fields using quote rule %d\n", + sep, topNumFields, quoteRule); } } } else { @@ -1780,8 +1781,9 @@ int freadMain(freadMainArgs _args) { topSkip = thisRow-thisBlockLines; if (topSkip<0) topSkip=0; // inelegant but will do for now to pass single row input such as test 890 if (verbose) { - DTPRINT((unsigned)sep<32 ? " sep=%#02x" : " sep='%c'", sep); // # notranslate - DTPRINT(_(" with %d lines of %d fields using quote rule %d\n"), topNumLines, topNumFields, topQuoteRule); + DTPRINT((unsigned)sep<32 ? " sep=%#02x with %d lines of %d fields using quote rule %d\n" + : " sep='%c' with %d lines of %d fields using quote rule %d\n", + sep, topNumLines, topNumFields, topQuoteRule); } } } From 4bc0e27b8abfe66ac2ead17f59dd877297a511eb Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Mon, 3 Mar 2025 14:52:21 -0800 Subject: [PATCH 2/4] whitespace style --- src/fread.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/fread.c b/src/fread.c index 1c3ae8b045..aa99d5adad 100644 --- a/src/fread.c +++ b/src/fread.c @@ -1730,9 +1730,10 @@ int freadMain(freadMainArgs _args) { topQuoteRule = quoteRule; firstJumpEnd = ch; // to know how many bytes jump 0 is, for nrow estimate later (a less-good estimate when fill=true since line lengths vary more) if (verbose) { - DTPRINT((unsigned)sep<32 ? " sep=%#02x with %d fields using quote rule %d\n" - : " sep='%c' with %d fields using quote rule %d\n", - sep, topNumFields, quoteRule); + DTPRINT((unsigned)sep<32 + ? " sep=%#02x with %d fields using quote rule %d\n" + : " sep='%c' with %d fields using quote rule %d\n", + sep, topNumFields, quoteRule); } } } else { @@ -1781,9 +1782,10 @@ int freadMain(freadMainArgs _args) { topSkip = thisRow-thisBlockLines; if (topSkip<0) topSkip=0; // inelegant but will do for now to pass single row input such as test 890 if (verbose) { - DTPRINT((unsigned)sep<32 ? " sep=%#02x with %d lines of %d fields using quote rule %d\n" - : " sep='%c' with %d lines of %d fields using quote rule %d\n", - sep, topNumLines, topNumFields, topQuoteRule); + DTPRINT((unsigned)sep<32 + ? " sep=%#02x with %d lines of %d fields using quote rule %d\n" + : " sep='%c' with %d lines of %d fields using quote rule %d\n", + sep, topNumLines, topNumFields, topQuoteRule); } } } From b5e59b72beb033327b0f842c9d13994292f4f0c9 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Tue, 4 Mar 2025 09:49:04 +0300 Subject: [PATCH 3/4] Restore translation, fix whitespace --- src/fread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fread.c b/src/fread.c index aa99d5adad..8302c18753 100644 --- a/src/fread.c +++ b/src/fread.c @@ -1731,8 +1731,8 @@ int freadMain(freadMainArgs _args) { firstJumpEnd = ch; // to know how many bytes jump 0 is, for nrow estimate later (a less-good estimate when fill=true since line lengths vary more) if (verbose) { DTPRINT((unsigned)sep<32 - ? " sep=%#02x with %d fields using quote rule %d\n" - : " sep='%c' with %d fields using quote rule %d\n", + ? _(" sep=%#02x with %d fields using quote rule %d\n") + : _(" sep='%c' with %d fields using quote rule %d\n"), sep, topNumFields, quoteRule); } } From b6423fe0e7b3e116fd25bccd84188ccb779a043a Mon Sep 17 00:00:00 2001 From: Ivan K Date: Tue, 4 Mar 2025 10:08:55 +0300 Subject: [PATCH 4/4] Restore translation, fix whitespace (2/2) --- src/fread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fread.c b/src/fread.c index 8302c18753..0ca41810c4 100644 --- a/src/fread.c +++ b/src/fread.c @@ -1783,8 +1783,8 @@ int freadMain(freadMainArgs _args) { if (topSkip<0) topSkip=0; // inelegant but will do for now to pass single row input such as test 890 if (verbose) { DTPRINT((unsigned)sep<32 - ? " sep=%#02x with %d lines of %d fields using quote rule %d\n" - : " sep='%c' with %d lines of %d fields using quote rule %d\n", + ? _(" sep=%#02x with %d lines of %d fields using quote rule %d\n") + : _(" sep='%c' with %d lines of %d fields using quote rule %d\n"), sep, topNumLines, topNumFields, topQuoteRule); } }