Message fixes

alvherre · alvherre · commit ffbce803e646 · 2019-04-29T10:05:45.000-04:00
diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
@@ -228,14 +228,14 @@ scan_file(const char *fn, BlockNumber segmentno)
 			/* Seek back to beginning of block */
 			if (lseek(f, -BLCKSZ, SEEK_CUR) < 0)
 			{
-				pg_log_error("seek failed for block %d in file \"%s\": %m", blockno, fn);
+				pg_log_error("seek failed for block %u in file \"%s\": %m", blockno, fn);
 				exit(1);
 			}
 
 			/* Write block with checksum */
 			if (write(f, buf.data, BLCKSZ) != BLCKSZ)
 			{
-				pg_log_error("could not update checksum of block %d in file \"%s\": %m",
+				pg_log_error("could not update checksum of block %u in file \"%s\": %m",
 							 blockno, fn);
 				exit(1);
 			}
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
@@ -73,8 +73,8 @@ usage(const char *progname)
 	printf(_("      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"));
 	printf(_("      --source-server=CONNSTR    source server to synchronize with\n"));
 	printf(_("  -n, --dry-run                  stop before modifying anything\n"));
-	printf(_("  -N, --no-sync                  do not wait for changes to be written\n"));
-	printf(_("                                 safely to disk\n"));
+	printf(_("  -N, --no-sync                  do not wait for changes to be written\n"
+			 "                                 safely to disk\n"));
 	printf(_("  -P, --progress                 write progress messages\n"));
 	printf(_("      --debug                    write a lot of debug messages\n"));
 	printf(_("  -V, --version                  output version information, then exit\n"));
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
@@ -901,7 +901,7 @@ check_for_tables_with_oids(ClusterInfo *cluster)
 	bool		found = false;
 	char		output_path[MAXPGPATH];
 
-	prep_status("Checking for tables WITH OIDs");
+	prep_status("Checking for tables WITH OIDS");
 
 	snprintf(output_path, sizeof(output_path),
 			 "tables_with_oids.txt");
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -409,30 +409,30 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 	if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600)
 	{
 		PQfinish(conn);
-		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6",
-					 "disable-page-skipping");
+		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
+					 "disable-page-skipping", "9.6");
 		exit(1);
 	}
 
 	if (vacopts->skip_locked && PQserverVersion(conn) < 120000)
 	{
 		PQfinish(conn);
-		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 12",
-					 "skip-locked");
+		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
+					 "skip-locked", "12");
 		exit(1);
 	}
 
 	if (vacopts->min_xid_age != 0 && PQserverVersion(conn) < 90600)
 	{
-		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6",
-					 "--min-xid-age");
+		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
+					 "--min-xid-age", "9.6");
 		exit(1);
 	}
 
 	if (vacopts->min_mxid_age != 0 && PQserverVersion(conn) < 90600)
 	{
-		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6",
-					 "--min-mxid-age");
+		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
+					 "--min-mxid-age", "9.6");
 		exit(1);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -228,14 +228,14 @@ scan_file(const char *fn, BlockNumber segmentno)`
`228`	`228`	`/* Seek back to beginning of block */`
`229`	`229`	`if (lseek(f, -BLCKSZ, SEEK_CUR) < 0)`
`230`	`230`	`{`
`231`		`- pg_log_error("seek failed for block %d in file \"%s\": %m", blockno, fn);`
	`231`	`+ pg_log_error("seek failed for block %u in file \"%s\": %m", blockno, fn);`
`232`	`232`	`exit(1);`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`/* Write block with checksum */`
`236`	`236`	`if (write(f, buf.data, BLCKSZ) != BLCKSZ)`
`237`	`237`	`{`
`238`		`- pg_log_error("could not update checksum of block %d in file \"%s\": %m",`
	`238`	`+ pg_log_error("could not update checksum of block %u in file \"%s\": %m",`
`239`	`239`	`blockno, fn);`
`240`	`240`	`exit(1);`
`241`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -409,30 +409,30 @@ vacuum_one_database(const char dbname, vacuumingOptions vacopts,`
`409`	`409`	`if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600)`
`410`	`410`	`{`
`411`	`411`	`PQfinish(conn);`
`412`		`- pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6",`
`413`		`- "disable-page-skipping");`
	`412`	`+ pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",`
	`413`	`+ "disable-page-skipping", "9.6");`
`414`	`414`	`exit(1);`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`if (vacopts->skip_locked && PQserverVersion(conn) < 120000)`
`418`	`418`	`{`
`419`	`419`	`PQfinish(conn);`
`420`		`- pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 12",`
`421`		`- "skip-locked");`
	`420`	`+ pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",`
	`421`	`+ "skip-locked", "12");`
`422`	`422`	`exit(1);`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`if (vacopts->min_xid_age != 0 && PQserverVersion(conn) < 90600)`
`426`	`426`	`{`
`427`		`- pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6",`
`428`		`- "--min-xid-age");`
	`427`	`+ pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",`
	`428`	`+ "--min-xid-age", "9.6");`
`429`	`429`	`exit(1);`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`if (vacopts->min_mxid_age != 0 && PQserverVersion(conn) < 90600)`
`433`	`433`	`{`
`434`		`- pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6",`
`435`		`- "--min-mxid-age");`
	`434`	`+ pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",`
	`435`	`+ "--min-mxid-age", "9.6");`
`436`	`436`	`exit(1);`
`437`	`437`	`}`
`438`	`438`