From 5cc380f9a36dc0eae05c9063958db257977eef67 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 1 Aug 2004 17:45:43 +0000
Subject: [PATCH] Error message style adjustments, per Alvaro Herrera.

---
 src/backend/access/transam/xlog.c   | 8 ++++----
 src/backend/postmaster/pgarch.c     | 4 ++--
 src/backend/postmaster/postmaster.c | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index f9a49332ba..b0fac74526 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.152 2004/07/22 21:09:37 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.153 2004/08/01 17:45:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1936,7 +1936,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
 		if (unlink(xlogpath) != 0)
 			ereport(FATAL,
 					(errcode_for_file_access(),
-					 errmsg("could not remove \"%s\": %m",
+					 errmsg("could not remove file \"%s\": %m",
 							xlogpath)));
 	}
 
@@ -3772,7 +3772,7 @@ exitArchiveRecovery(TimeLineID endTLI, uint32 endLogId, uint32 endLogSeg)
 		if (rename(recoveryPath, xlogpath) != 0)
 			ereport(FATAL,
 					(errcode_for_file_access(),
-					 errmsg("could not rename \"%s\" to \"%s\": %m",
+					 errmsg("could not rename file \"%s\" to \"%s\": %m",
 							recoveryPath, xlogpath)));
 		/* XXX might we need to fix permissions on the file? */
 	}
@@ -3814,7 +3814,7 @@ exitArchiveRecovery(TimeLineID endTLI, uint32 endLogId, uint32 endLogSeg)
 	if (rename(recoveryCommandFile, recoveryCommandDone) != 0)
 		ereport(FATAL,
 				(errcode_for_file_access(),
-				 errmsg("could not rename \"%s\" to \"%s\": %m",
+				 errmsg("could not rename file \"%s\" to \"%s\": %m",
 						recoveryCommandFile, recoveryCommandDone)));
 
 	ereport(LOG,
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
index d42c43195d..a403896333 100644
--- a/src/backend/postmaster/pgarch.c
+++ b/src/backend/postmaster/pgarch.c
@@ -19,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.2 2004/07/21 22:31:22 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.3 2004/08/01 17:45:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -587,6 +587,6 @@ pgarch_archiveDone(char *xlog)
  	if (rename(rlogready, rlogdone) < 0)
  		ereport(WARNING,
 				(errcode_for_file_access(),
-				 errmsg("could not rename \"%s\" to \"%s\": %m",
+				 errmsg("could not rename file \"%s\" to \"%s\": %m",
 						rlogready, rlogdone)));
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index e144b6eaa9..c3123b6901 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.417 2004/07/31 00:45:33 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.418 2004/08/01 17:45:43 tgl Exp $
  *
  * NOTES
  *
@@ -544,7 +544,7 @@ PostmasterMain(int argc, char *argv[])
 		if (!guc_pgdata)	/* Got a pgdata from the config file? */
 		{
 			write_stderr("%s does not know where to find the database system data.\n"
-						 "This should be specified as 'pgdata' in %s%s.\n",
+						 "This should be specified as \"pgdata\" in %s%s.\n",
 						 progname, userPGDATA,
 						 user_pgconfig_is_dir ? "/postgresql.conf" : "");
 			ExitPostmaster(2);