rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_resetwal: Rename function to avoid potential conflict 

ReadControlFile() here conflicts with a function of the same name in
xlog.c.  There is no actual conflict right now, but since
pg_resetwal.c reaches deep inside backend headers, it's possible in
the future.

Discussion: https://www.postgresql.org/message-id/e8f86ba5-48f1-a80a-7f1d-b76bcb9c5c47@2ndquadrant.com
This commit is contained in:
Peter Eisentraut 2020-02-17 17:35:48 +01:00
parent ec4a7851d5
commit 5f1b8260af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/pg_resetwal/pg_resetwal.c
View File

@ -76,7 +76,7 @@ static int WalSegSz;
static int set_wal_segsize; static int set_wal_segsize;
static void CheckDataVersion(void); static void CheckDataVersion(void);
static bool ReadControlFile(void); static bool read_controlfile(void);
static void GuessControlValues(void); static void GuessControlValues(void);
static void PrintControlValues(bool guessed); static void PrintControlValues(bool guessed);
static void PrintNewControlValues(void); static void PrintNewControlValues(void);
@ -393,7 +393,7 @@ main(int argc, char *argv[])
/* /*
* Attempt to read the existing pg_control file * Attempt to read the existing pg_control file
*/ */
if (!ReadControlFile()) if (!read_controlfile())
GuessControlValues(); GuessControlValues();
/* /*
@ -578,7 +578,7 @@ CheckDataVersion(void)
* to the current format. (Currently we don't do anything of the sort.) * to the current format. (Currently we don't do anything of the sort.)
*/ */
static bool static bool
ReadControlFile(void) read_controlfile(void)
{ {
int fd; int fd;
int len; int len;