Improve readability and error messages in pg_backup_start_time.

robertmhaas · robertmhaas · commit 8507c2f8564b · 2012-06-14T15:20:08.000-04:00
Gurjeet Singh, with corrections by me.
diff --git 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),
