Error message style adjustments, per Alvaro Herrera.

tglsfdc · tglsfdc · commit 5cc380f9a36d · 2004-08-01T17:45:43.000Z
diff --git 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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`*`
`21`	`21`	`* IDENTIFICATION`
`22`		`- * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.2 2004/07/21 22:31:22 tgl Exp $`
	`22`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.3 2004/08/01 17:45:43 tgl Exp $`
`23`	`23`	`*`
`24`	`24`	`*-------------------------------------------------------------------------`
`25`	`25`	`*/`
`@@ -587,6 +587,6 @@ pgarch_archiveDone(char *xlog)`
`587`	`587`	`if (rename(rlogready, rlogdone) < 0)`
`588`	`588`	`ereport(WARNING,`
`589`	`589`	`(errcode_for_file_access(),`
`590`		`- errmsg("could not rename \"%s\" to \"%s\": %m",`
	`590`	`+ errmsg("could not rename file \"%s\" to \"%s\": %m",`
`591`	`591`	`rlogready, rlogdone)));`
`592`	`592`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.417 2004/07/31 00:45:33 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.418 2004/08/01 17:45:43 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -544,7 +544,7 @@ PostmasterMain(int argc, char *argv[])`
`544`	`544`	`if (!guc_pgdata) /* Got a pgdata from the config file? */`
`545`	`545`	`{`
`546`	`546`	`write_stderr("%s does not know where to find the database system data.\n"`
`547`		`- "This should be specified as 'pgdata' in %s%s.\n",`
	`547`	`+ "This should be specified as \"pgdata\" in %s%s.\n",`
`548`	`548`	`progname, userPGDATA,`
`549`	`549`	`user_pgconfig_is_dir ? "/postgresql.conf" : "");`
`550`	`550`	`ExitPostmaster(2);`