From 5d0109bd2776ce918821f360e951270caa96ba8a Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 7 Jun 2012 23:35:33 +0300
Subject: [PATCH] Message style improvements
---
src/bin/initdb/initdb.c | 4 ++--
src/bin/pg_ctl/pg_ctl.c | 2 +-
src/bin/pg_dump/compress_io.c | 2 +-
src/bin/pg_dump/dumputils.c | 2 +-
src/bin/pg_dump/pg_backup_directory.c | 6 +++---
src/bin/pg_dump/pg_dump_sort.c | 2 +-
src/bin/pg_resetxlog/pg_resetxlog.c | 2 +-
src/bin/psql/command.c | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 303b0cf7560..2707334dd52 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2493,7 +2493,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo)
processInfo))
{
- fprintf(stderr, _("%s: could not start process for \"%s\": error code %lu\n"), progname, cmd, GetLastError());
+ fprintf(stderr, _("%s: could not start process for command \"%s\": error code %lu\n"), progname, cmd, GetLastError());
return 0;
}
@@ -2838,7 +2838,7 @@ main(int argc, char *argv[])
if (!CreateRestrictedProcess(cmdline, &pi))
{
- fprintf(stderr, _("%s: could not re-exec with restricted token: error code %lu\n"), progname, GetLastError());
+ fprintf(stderr, _("%s: could not re-execute with restricted token: error code %lu\n"), progname, GetLastError());
}
else
{
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 329cc24dd6e..766ba95be1f 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -1926,7 +1926,7 @@ adjust_data_dir(void)
fd = popen(cmd, "r");
if (fd == NULL || fgets(filename, sizeof(filename), fd) == NULL)
{
- write_stderr(_("%s: cannot find the data directory using %s\n"), progname, my_exec_path);
+ write_stderr(_("%s: could not determine the data directory using \"%s\"\n"), progname, cmd);
exit(1);
}
pclose(fd);
diff --git a/src/bin/pg_dump/compress_io.c b/src/bin/pg_dump/compress_io.c
index ff8e714074f..e192c724776 100644
--- a/src/bin/pg_dump/compress_io.c
+++ b/src/bin/pg_dump/compress_io.c
@@ -110,7 +110,7 @@ ParseCompressionOption(int compression, CompressionAlgorithm *alg, int *level)
*alg = COMPR_ALG_NONE;
else
{
- exit_horribly(modulename, "Invalid compression code: %d\n",
+ exit_horribly(modulename, "invalid compression code: %d\n",
compression);
*alg = COMPR_ALG_NONE; /* keep compiler quiet */
}
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
index 6d10970e7c8..f5d7b5d8594 100644
--- a/src/bin/pg_dump/dumputils.c
+++ b/src/bin/pg_dump/dumputils.c
@@ -1260,7 +1260,7 @@ set_dump_section(const char *arg, int *dumpSections)
*dumpSections |= DUMP_POST_DATA;
else
{
- fprintf(stderr, _("%s: unknown section name \"%s\")\n"),
+ fprintf(stderr, _("%s: unrecognized section name: \"%s\"\n"),
progname, arg);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index 8d43cd2ade4..629e309abe5 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -407,8 +407,8 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
char path[MAXPGPATH];
if (sscanf(line, "%u %s\n", &oid, fname) != 2)
- exit_horribly(modulename, "invalid line in large object TOC file: %s\n",
- line);
+ exit_horribly(modulename, "invalid line in large object TOC file \"%s\": \"%s\"\n",
+ fname, line);
StartRestoreBlob(AH, oid, ropt->dropSchema);
snprintf(path, MAXPGPATH, "%s/%s", ctx->directory, fname);
@@ -667,7 +667,7 @@ prependDirectory(ArchiveHandle *AH, const char *relativeFilename)
dname = ctx->directory;
if (strlen(dname) + 1 + strlen(relativeFilename) + 1 > MAXPGPATH)
- exit_horribly(modulename, "path name too long: %s", dname);
+ exit_horribly(modulename, "file name too long: \"%s\"", dname);
strcpy(buf, dname);
strcat(buf, "/");
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index a6533bee3de..2a1b4299ca8 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -993,7 +993,7 @@ repairDependencyLoop(DumpableObject **loop,
write_msg(NULL, "NOTICE: there are circular foreign-key constraints among these table(s):\n");
for (i = 0; i < nLoop; i++)
write_msg(NULL, " %s\n", loop[i]->name);
- write_msg(NULL, "You may not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n");
+ write_msg(NULL, "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n");
write_msg(NULL, "Consider using a full dump instead of a --data-only dump to avoid this problem.\n");
if (nLoop > 1)
removeObjectDependency(loop[0], loop[1]->dumpId);
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index 8e2a2530b8f..65ba9103a63 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -570,7 +570,7 @@ PrintControlValues(bool guessed)
sysident_str);
printf(_("Latest checkpoint's TimeLineID: %u\n"),
ControlFile.checkPointCopy.ThisTimeLineID);
- printf(_("Latest checkpoint's full_page_writes: %s\n"),
+ printf(_("Latest checkpoint's full_page_writes: %s\n"),
ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
printf(_("Latest checkpoint's NextXID: %u/%u\n"),
ControlFile.checkPointCopy.nextXidEpoch,
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 7f91ff9fcef..8544d15109a 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -1114,7 +1114,7 @@ exec_command(const char *cmd,
}
else if (strchr(envvar,'=') != NULL)
{
- psql_error("\\%s: environment variable name must not contain '='\n",
+ psql_error("\\%s: environment variable name must not contain \"=\"\n",
cmd);
success = false;
}
--
GitLab