Add some forgotten LSN_FORMAT_ARGS() in xlogreader.c

michaelpq · michaelpq · commit 4aba61b87026 · 2021-04-24T09:09:02.000+09:00
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
diff --git 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;
 					}
