Skip to content

P
Postgres FD Implementation
Commit 8507c2f8 authored by Robert Haas's avatar Robert Haas
Browse files
Options

Improve readability and error messages in pg_backup_start_time. 

Gurjeet Singh, with corrections by me.
parent c616d85f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
src/backend/access/transam/xlogfuncs.c
View file @ 8507c2f8
...@@ -611,14 +611,18 @@ pg_backup_start_time(PG_FUNCTION_ARGS) ...@@ -611,14 +611,18 @@ pg_backup_start_time(PG_FUNCTION_ARGS)
break; break;
} }
/* /* Check for a read error. */
* Close the backup label file. if (ferror(lfp))
*/
if (ferror(lfp) || FreeFile(lfp))
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not read file \"%s\": %m", BACKUP_LABEL_FILE))); errmsg("could not read file \"%s\": %m", BACKUP_LABEL_FILE)));
/* Close the backup label file. */
if (FreeFile(lfp))
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not close file \"%s\": %m", BACKUP_LABEL_FILE)));
if (strlen(backup_start_time) == 0) if (strlen(backup_start_time) == 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment