Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5f1b826

Browse files
committed
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
1 parent ec4a785 commit 5f1b826

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/bin/pg_resetwal/pg_resetwal.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static int WalSegSz;
7676
static int set_wal_segsize;
7777

7878
static void CheckDataVersion(void);
79-
static bool ReadControlFile(void);
79+
static bool read_controlfile(void);
8080
static void GuessControlValues(void);
8181
static void PrintControlValues(bool guessed);
8282
static void PrintNewControlValues(void);
@@ -393,7 +393,7 @@ main(int argc, char *argv[])
393393
/*
394394
* Attempt to read the existing pg_control file
395395
*/
396-
if (!ReadControlFile())
396+
if (!read_controlfile())
397397
GuessControlValues();
398398

399399
/*
@@ -578,7 +578,7 @@ CheckDataVersion(void)
578578
* to the current format. (Currently we don't do anything of the sort.)
579579
*/
580580
static bool
581-
ReadControlFile(void)
581+
read_controlfile(void)
582582
{
583583
int fd;
584584
int len;

0 commit comments

Comments
 (0)