From 8507c2f8564b709bb6a3cc86e9599f6129f45c8e Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Thu, 14 Jun 2012 15:20:08 -0400
Subject: [PATCH] Improve readability and error messages in
pg_backup_start_time.
Gurjeet Singh, with corrections by me.
---
src/backend/access/transam/xlogfuncs.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index d94809ad7ee..adf0b16e56a 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -611,14 +611,18 @@ pg_backup_start_time(PG_FUNCTION_ARGS)
break;
}
- /*
- * Close the backup label file.
- */
- if (ferror(lfp) || FreeFile(lfp))
+ /* Check for a read error. */
+ if (ferror(lfp))
ereport(ERROR,
(errcode_for_file_access(),
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)
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
--
GitLab