Commit8507c2f

committed

Improve readability and error messages in pg_backup_start_time.

Gurjeet Singh, with corrections by me.

1 parentc616d85 commit8507c2fCopy full SHA for 8507c2f

File tree

-4

lines changed

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -611,14 +611,18 @@ pg_backup_start_time(PG_FUNCTION_ARGS)`
`611`	`611`	`break;`
`612`	`612`	`}`
`613`	`613`
`614`		`-/*`
`615`		`- * Close the backup label file.`
`616`		`- */`
`617`		`-if (ferror(lfp)\|\|FreeFile(lfp))`
	`614`	`+/* Check for a read error. */`
	`615`	`+if (ferror(lfp))`
`618`	`616`	`ereport(ERROR,`
`619`	`617`	`(errcode_for_file_access(),`
`620`	`618`	`errmsg("could not read file \"%s\": %m",BACKUP_LABEL_FILE)));`
`621`	`619`
	`620`	`+/* Close the backup label file. */`
	`621`	`+if (FreeFile(lfp))`
	`622`	`+ereport(ERROR,`
	`623`	`+(errcode_for_file_access(),`
	`624`	`+errmsg("could not close file \"%s\": %m",BACKUP_LABEL_FILE)));`
	`625`	`+`
`622`	`626`	`if (strlen(backup_start_time)==0)`
`623`	`627`	`ereport(ERROR,`
`624`	`628`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`

Comments

(0)