pg_waldump: Fix --bkp-details to not issue spurious newlines for FPWs.

The additional newline seems to have accidentally been introduced in
2c03216d831, in 9.5. The newline is only issued when an FPW is
present for the block reference.

While there could be an argument that removing the newlines in the
back branches could cause a problem for somebody parsing the
pg_waldump output, the likelihood of that seems small enough. It seems
at least equally likely that the randomness of when newlines are
issued causes problems.

Author: Andres Freund
Discussion: https://postgr.es/m/20191029233341[email protected]
Backpatch: 9.5, like 2c03216d831.

diff --git a/src/bin/pg_xlogdump/pg_xlogdump.c b/src/bin/pg_xlogdump/pg_xlogdump.c
index c950048c2b6f0d0b4cfeee1c6c36f0c8d10217d6..4ef5206261905c0dccb1e77614971d23c024f153 100644 (file)
--- a/src/bin/pg_xlogdump/pg_xlogdump.c
+++ b/src/bin/pg_xlogdump/pg_xlogdump.c
@@ -509,7 +509,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
                if (record->blocks[block_id].bimg_info &
                    BKPIMAGE_IS_COMPRESSED)
                {
-                   printf(" (FPW); hole: offset: %u, length: %u, compression saved: %u\n",
+                   printf(" (FPW); hole: offset: %u, length: %u, compression saved: %u",
                           record->blocks[block_id].hole_offset,
                           record->blocks[block_id].hole_length,
                           BLCKSZ -
@@ -518,7 +518,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
                }
                else
                {
-                   printf(" (FPW); hole: offset: %u, length: %u\n",
+                   printf(" (FPW); hole: offset: %u, length: %u",
                           record->blocks[block_id].hole_offset,
                           record->blocks[block_id].hole_length);
                }