Commit5f1b826

committed

pg_resetwal: Rename function to avoid potential conflict

ReadControlFile() here conflicts with a function of the same name inxlog.c. There is no actual conflict right now, but sincepg_resetwal.c reaches deep inside backend headers, it's possible inthe future.Discussion:https://www.postgresql.org/message-id/e8f86ba5-48f1-a80a-7f1d-b76bcb9c5c47@2ndquadrant.com

1 parentec4a785 commit5f1b826Copy full SHA for 5f1b826

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ static intWalSegSz;`
`76`	`76`	`staticintset_wal_segsize;`
`77`	`77`
`78`	`78`	`staticvoidCheckDataVersion(void);`
`79`		`-staticboolReadControlFile(void);`
	`79`	`+staticboolread_controlfile(void);`
`80`	`80`	`staticvoidGuessControlValues(void);`
`81`	`81`	`staticvoidPrintControlValues(boolguessed);`
`82`	`82`	`staticvoidPrintNewControlValues(void);`
`@@ -393,7 +393,7 @@ main(int argc, char *argv[])`
`393`	`393`	`/*`
`394`	`394`	`* Attempt to read the existing pg_control file`
`395`	`395`	`*/`
`396`		`-if (!ReadControlFile())`
	`396`	`+if (!read_controlfile())`
`397`	`397`	`GuessControlValues();`
`398`	`398`
`399`	`399`	`/*`
`@@ -578,7 +578,7 @@ CheckDataVersion(void)`
`578`	`578`	`* to the current format. (Currently we don't do anything of the sort.)`
`579`	`579`	`*/`
`580`	`580`	`staticbool`
`581`		`-ReadControlFile(void)`
	`581`	`+read_controlfile(void)`
`582`	`582`	`{`
`583`	`583`	`intfd;`
`584`	`584`	`intlen;`

Comments

(0)