From 4aba61b87026b43fb37fc8e9ec5d9ae208e07b6b Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Sat, 24 Apr 2021 09:09:02 +0900 Subject: [PATCH] Add some forgotten LSN_FORMAT_ARGS() in xlogreader.c 6f6f284 has introduced a specific macro to make printf()-ing of LSNs easier. This takes care of what looks like the remaining code paths that did not get the call. Author: Michael Paquier Reviewed-by: Kyotaro Horiguchi, Tom Lane Discussion: https://postgr.es/m/YIJS9x6K8ruizN7j@paquier.xyz --- src/backend/access/transam/xlogreader.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index 3ae4127b8a..4277e92d7c 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -754,8 +754,7 @@ XLogDecodeOneRecord(XLogReaderState *state, bool allow_oversized) targetRecOff == pageHeaderSize) { report_invalid_record(state, "contrecord is requested by %X/%X", - (uint32) (state->DecodeRecPtr >> 32), - (uint32) state->DecodeRecPtr); + LSN_FORMAT_ARGS(state->DecodeRecPtr)); goto err; } @@ -968,10 +967,8 @@ XLogDecodeOneRecord(XLogReaderState *state, bool allow_oversized) report_invalid_record( state, "there is no contrecord flag at %X/%X reading %X/%X", - (uint32) (state->recordContRecPtr >> 32), - (uint32) state->recordContRecPtr, - (uint32) (state->DecodeRecPtr >> 32), - (uint32) state->DecodeRecPtr); + LSN_FORMAT_ARGS(state->recordContRecPtr), + LSN_FORMAT_ARGS(state->DecodeRecPtr)); goto err; } @@ -986,10 +983,8 @@ XLogDecodeOneRecord(XLogReaderState *state, bool allow_oversized) state, "invalid contrecord length %u at %X/%X reading %X/%X, expected %u", pageHeader->xlp_rem_len, - (uint32) (state->recordContRecPtr >> 32), - (uint32) state->recordContRecPtr, - (uint32) (state->DecodeRecPtr >> 32), - (uint32) state->DecodeRecPtr, + LSN_FORMAT_ARGS(state->recordContRecPtr), + LSN_FORMAT_ARGS(state->DecodeRecPtr), state->recordRemainLen); goto err; }