From 25dcc9d35dfeb027047ebaea9b27cda1eaa9b393 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 3 Sep 2019 17:41:43 -0400 Subject: Make XLogReaderInvalReadState static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function is only used by xlogreader.c itself, so there's no need to export it. It was introduced by commit 3b02ea4f0780 with the apparent intention that it could be used externally, but I couldn't find any external code calling it. I (Álvaro) couldn't resist the urge to sort nearby function prototypes properly while at it. Author: Antonin Houska Discussion: https://postgr.es/m/14984.1554998742@spoje.net --- src/backend/access/transam/xlogreader.c | 13 +++++++------ src/include/access/xlogreader.h | 4 ---- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index c6faf48d24f..a66e3324b11 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -30,16 +30,17 @@ #include "utils/memutils.h" #endif -static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength); +static void report_invalid_record(XLogReaderState *state, const char *fmt,...) + pg_attribute_printf(2, 3); +static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength); +static int ReadPageInternal(XLogReaderState *state, XLogRecPtr pageptr, + int reqLen); +static void XLogReaderInvalReadState(XLogReaderState *state); static bool ValidXLogRecordHeader(XLogReaderState *state, XLogRecPtr RecPtr, XLogRecPtr PrevRecPtr, XLogRecord *record, bool randAccess); static bool ValidXLogRecord(XLogReaderState *state, XLogRecord *record, XLogRecPtr recptr); -static int ReadPageInternal(XLogReaderState *state, XLogRecPtr pageptr, - int reqLen); -static void report_invalid_record(XLogReaderState *state, const char *fmt,...) pg_attribute_printf(2, 3); - static void ResetDecoder(XLogReaderState *state); /* size of the buffer allocated for error message. */ @@ -621,7 +622,7 @@ err: /* * Invalidate the xlogreader's read state to force a re-read. */ -void +static void XLogReaderInvalReadState(XLogReaderState *state) { state->readSegNo = 0; diff --git a/src/include/access/xlogreader.h b/src/include/access/xlogreader.h index aa9bc637259..735b1bd2fd6 100644 --- a/src/include/access/xlogreader.h +++ b/src/include/access/xlogreader.h @@ -216,13 +216,9 @@ extern struct XLogRecord *XLogReadRecord(XLogReaderState *state, extern bool XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr, char *phdr); -/* Invalidate read state */ -extern void XLogReaderInvalReadState(XLogReaderState *state); - #ifdef FRONTEND extern XLogRecPtr XLogFindNextRecord(XLogReaderState *state, XLogRecPtr RecPtr); #endif /* FRONTEND */ - /* Functions for decoding an XLogRecord */ extern bool DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, -- cgit v1.2.3