Hi all, As $subject says, I noticed that while scanning the area. Any objections to make all that more consistent with the style of HEAD? Please see the attached. -- Michael
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index 3ae4127b8a..c0e7c3707d 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; } @@ -965,13 +964,10 @@ XLogDecodeOneRecord(XLogReaderState *state, bool allow_oversized) pageHeader = (XLogPageHeader) state->readBuf; if (!(pageHeader->xlp_info & XLP_FIRST_IS_CONTRECORD)) { - report_invalid_record( - state, + 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 +982,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; }
signature.asc
Description: PGP signature