Message fixes

diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index 32d5668749f3b9e42516a499a77b69a9bf785835..768d038d79b2d140bbeb05bc95bb879b247550fc 100644 (file)
--- 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
index b7e6aca97facdc12c8f6dcc05ecb186b8751c889..3702efaf9f42509d8208d4e1a1112b2b34f48efc 100644 (file)
--- 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
index fc5aa7010f8ec48cfedf5747db1b1b70c7990af8..617270f101d4a62f6dd4f188c826a5509ceb7dc7 100644 (file)
--- 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
index 25ff19e0a1d608efcef9d984a7d32b48a1f3be42..f15e1ad8f1ca9856fd0cb627be3f5783f189c3ac 100644 (file)
--- 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);
        }