mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve readability and error messages in pg_backup_start_time.

Browse Source 
Gurjeet Singh, with corrections by me.
This commit is contained in:
Robert Haas 2012-06-14 15:20:08 -04:00
parent c616d85f6b
commit 8507c2f856
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/access/transam/xlogfuncs.c
View File

@ -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),