Message style improvements

Fix one untranslatable string concatenation in pg_rewind.

Fix one message in pg_verify_checksums to use a style use elsewhere
and avoid plural issues.

Fix one gratuitous abbreviation in psql.

diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index 8f49d346528732fccae17f664f38d6b44f8187f5..4ad7b2f2074c71a0dd5703e048170574ca9f3a08 100644 (file)
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -30,7 +30,7 @@ static char *datasegpath(RelFileNode rnode, ForkNumber forknum,
 static int path_cmp(const void *a, const void *b);
 static int final_filemap_cmp(const void *a, const void *b);
 static void filemap_list_to_array(filemap_t *map);
-static bool check_file_excluded(const char *path, const char *type);
+static bool check_file_excluded(const char *path, bool is_source);
 
 /*
  * The contents of these directories are removed or recreated during server
@@ -148,7 +148,7 @@ process_source_file(const char *path, file_type_t type, size_t newsize,
    Assert(map->array == NULL);
 
    /* ignore any path matching the exclusion filters */
-   if (check_file_excluded(path, "source"))
+   if (check_file_excluded(path, true))
        return;
 
    /*
@@ -338,7 +338,7 @@ process_target_file(const char *path, file_type_t type, size_t oldsize,
     * mandatory for target files, but this does not hurt and let's be
     * consistent with the source processing.
     */
-   if (check_file_excluded(path, "target"))
+   if (check_file_excluded(path, false))
        return;
 
    snprintf(localpath, sizeof(localpath), "%s/%s", datadir_target, path);
@@ -490,7 +490,7 @@ process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno)
  * Is this the path of file that pg_rewind can skip copying?
  */
 static bool
-check_file_excluded(const char *path, const char *type)
+check_file_excluded(const char *path, bool is_source)
 {
    char        localpath[MAXPGPATH];
    int         excludeIdx;
@@ -506,8 +506,12 @@ check_file_excluded(const char *path, const char *type)
            filename++;
        if (strcmp(filename, excludeFiles[excludeIdx]) == 0)
        {
-           pg_log(PG_DEBUG, "entry \"%s\" excluded from %s file list\n",
-                  path, type);
+           if (is_source)
+               pg_log(PG_DEBUG, "entry \"%s\" excluded from source file list\n",
+                      path);
+           else
+               pg_log(PG_DEBUG, "entry \"%s\" excluded from target file list\n",
+                      path);
            return true;
        }
    }
@@ -522,8 +526,12 @@ check_file_excluded(const char *path, const char *type)
                 excludeDirContents[excludeIdx]);
        if (strstr(path, localpath) == path)
        {
-           pg_log(PG_DEBUG, "entry \"%s\" excluded from %s file list\n",
-                  path, type);
+           if (is_source)
+               pg_log(PG_DEBUG, "entry \"%s\" excluded from source file list\n",
+                      path);
+           else
+               pg_log(PG_DEBUG, "entry \"%s\" excluded from target file list\n",
+                      path);
            return true;
        }
    }

diff --git a/src/bin/pg_verify_checksums/pg_verify_checksums.c b/src/bin/pg_verify_checksums/pg_verify_checksums.c
index d46bac2cd6593138e414160f3f1f7b110cc8e095..589a3cc58988f2716041efa5519a608196824e4f 100644 (file)
--- a/src/bin/pg_verify_checksums/pg_verify_checksums.c
+++ b/src/bin/pg_verify_checksums/pg_verify_checksums.c
@@ -99,8 +99,8 @@ scan_file(const char *fn, BlockNumber segmentno)
            break;
        if (r != BLCKSZ)
        {
-           fprintf(stderr, _("%s: short read of block %u in file \"%s\", got only %d bytes\n"),
-                   progname, blockno, fn, r);
+           fprintf(stderr, _("%s: could not read block %u in file \"%s\": read %d of %d\n"),
+                   progname, blockno, fn, r, BLCKSZ);
            exit(1);
        }
        blocks++;

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 316030d358a1e457b3ccddd3ae72835134b2cc60..586aebddd3dfca4b179a0b831cd5831a86eda241 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -369,7 +369,7 @@ helpVariables(unsigned short int pager)
    fprintf(output, _("  HISTFILE\n"
                      "    file name used to store the command history\n"));
    fprintf(output, _("  HISTSIZE\n"
-                     "    max number of commands to store in the command history\n"));
+                     "    maximum number of commands to store in the command history\n"));
    fprintf(output, _("  HOST\n"
                      "    the currently connected database server host\n"));
    fprintf(output, _("  IGNOREEOF\n"