Message style improvements

petere · petere · commit 85612039b9ea · 2011-08-14T21:03:08.000+03:00
diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c
@@ -83,7 +83,7 @@ Initialize(void)
 	if (stat(archiveLocation, &stat_buf) != 0 ||
 		!S_ISDIR(stat_buf.st_mode))
 	{
-		fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n",
+		fprintf(stderr, "%s: archive location \"%s\" does not exist\n",
 				progname, archiveLocation);
 		exit(2);
 	}
@@ -135,7 +135,7 @@ CleanupPriorWALFiles(void)
 		closedir(xldir);
 	}
 	else
-		fprintf(stderr, "%s: could not open archiveLocation \"%s\": %s\n",
+		fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",
 				progname, archiveLocation, strerror(errno));
 }
 
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -173,7 +173,7 @@ CustomizableInitialize(void)
 	 */
 	if (stat(archiveLocation, &stat_buf) != 0)
 	{
-		fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n", progname, archiveLocation);
+		fprintf(stderr, "%s: archive location \"%s\" does not exist\n", progname, archiveLocation);
 		fflush(stderr);
 		exit(2);
 	}
@@ -283,12 +283,12 @@ CustomizableCleanupPriorWALFiles(void)
 #endif
 
 					if (debug)
-						fprintf(stderr, "\nremoving \"%s\"", WALFilePath);
+						fprintf(stderr, "\nremoving file \"%s\"", WALFilePath);
 
 					rc = unlink(WALFilePath);
 					if (rc != 0)
 					{
-						fprintf(stderr, "\n%s: ERROR failed to remove \"%s\": %s",
+						fprintf(stderr, "\n%s: ERROR: could not remove file \"%s\": %s\n",
 								progname, WALFilePath, strerror(errno));
 						break;
 					}
@@ -298,7 +298,8 @@ CustomizableCleanupPriorWALFiles(void)
 				fprintf(stderr, "\n");
 		}
 		else
-			fprintf(stderr, "%s: archiveLocation \"%s\" open error\n", progname, archiveLocation);
+			fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",
+					progname, archiveLocation, strerror(errno));
 
 		closedir(xldir);
 		fflush(stderr);
@@ -693,7 +694,7 @@ main(int argc, char **argv)
 	}
 	else
 	{
-		fprintf(stderr, "%s: use %%f to specify nextWALFileName\n", progname);
+		fprintf(stderr, "%s: must specify WAL file name as second non-option argument (use \"%%f\")\n", progname);
 		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
 		exit(2);
 	}
@@ -705,7 +706,7 @@ main(int argc, char **argv)
 	}
 	else
 	{
-		fprintf(stderr, "%s: use %%p to specify xlogFilePath\n", progname);
+		fprintf(stderr, "%s: must specify xlog destination as third non-option argument (use \"%%p\")\n", progname);
 		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
 		exit(2);
 	}

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ Initialize(void)`
`83`	`83`	`if (stat(archiveLocation, &stat_buf) != 0 \|\|`
`84`	`84`	`!S_ISDIR(stat_buf.st_mode))`
`85`	`85`	`{`
`86`		`- fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n",`
	`86`	`+ fprintf(stderr, "%s: archive location \"%s\" does not exist\n",`
`87`	`87`	`progname, archiveLocation);`
`88`	`88`	`exit(2);`
`89`	`89`	`}`
`@@ -135,7 +135,7 @@ CleanupPriorWALFiles(void)`
`135`	`135`	`closedir(xldir);`
`136`	`136`	`}`
`137`	`137`	`else`
`138`		`- fprintf(stderr, "%s: could not open archiveLocation \"%s\": %s\n",`
	`138`	`+ fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",`
`139`	`139`	`progname, archiveLocation, strerror(errno));`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ CustomizableInitialize(void)`
`173`	`173`	`*/`
`174`	`174`	`if (stat(archiveLocation, &stat_buf) != 0)`
`175`	`175`	`{`
`176`		`- fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n", progname, archiveLocation);`
	`176`	`+ fprintf(stderr, "%s: archive location \"%s\" does not exist\n", progname, archiveLocation);`
`177`	`177`	`fflush(stderr);`
`178`	`178`	`exit(2);`
`179`	`179`	`}`
`@@ -283,12 +283,12 @@ CustomizableCleanupPriorWALFiles(void)`
`283`	`283`	`#endif`
`284`	`284`
`285`	`285`	`if (debug)`
`286`		`- fprintf(stderr, "\nremoving \"%s\"", WALFilePath);`
	`286`	`+ fprintf(stderr, "\nremoving file \"%s\"", WALFilePath);`
`287`	`287`
`288`	`288`	`rc = unlink(WALFilePath);`
`289`	`289`	`if (rc != 0)`
`290`	`290`	`{`
`291`		`- fprintf(stderr, "\n%s: ERROR failed to remove \"%s\": %s",`
	`291`	`+ fprintf(stderr, "\n%s: ERROR: could not remove file \"%s\": %s\n",`
`292`	`292`	`progname, WALFilePath, strerror(errno));`
`293`	`293`	`break;`
`294`	`294`	`}`
`@@ -298,7 +298,8 @@ CustomizableCleanupPriorWALFiles(void)`
`298`	`298`	`fprintf(stderr, "\n");`
`299`	`299`	`}`
`300`	`300`	`else`
`301`		`- fprintf(stderr, "%s: archiveLocation \"%s\" open error\n", progname, archiveLocation);`
	`301`	`+ fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",`
	`302`	`+ progname, archiveLocation, strerror(errno));`
`302`	`303`
`303`	`304`	`closedir(xldir);`
`304`	`305`	`fflush(stderr);`
`@@ -693,7 +694,7 @@ main(int argc, char **argv)`
`693`	`694`	`}`
`694`	`695`	`else`
`695`	`696`	`{`
`696`		`- fprintf(stderr, "%s: use %%f to specify nextWALFileName\n", progname);`
	`697`	`+ fprintf(stderr, "%s: must specify WAL file name as second non-option argument (use \"%%f\")\n", progname);`
`697`	`698`	`fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);`
`698`	`699`	`exit(2);`
`699`	`700`	`}`
`@@ -705,7 +706,7 @@ main(int argc, char **argv)`
`705`	`706`	`}`
`706`	`707`	`else`
`707`	`708`	`{`
`708`		`- fprintf(stderr, "%s: use %%p to specify xlogFilePath\n", progname);`
	`709`	`+ fprintf(stderr, "%s: must specify xlog destination as third non-option argument (use \"%%p\")\n", progname);`
`709`	`710`	`fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);`
`710`	`711`	`exit(2);`
`711`	`712`	`}`