Message style improvements
authorPeter Eisentraut <peter_e@gmx.net>
Thu, 7 Jun 2012 20:35:33 +0000 (23:35 +0300)
committerPeter Eisentraut <peter_e@gmx.net>
Thu, 7 Jun 2012 20:54:59 +0000 (23:54 +0300)
src/bin/initdb/initdb.c
src/bin/pg_ctl/pg_ctl.c
src/bin/pg_dump/compress_io.c
src/bin/pg_dump/dumputils.c
src/bin/pg_dump/pg_backup_directory.c
src/bin/pg_dump/pg_dump_sort.c
src/bin/pg_resetxlog/pg_resetxlog.c
src/bin/psql/command.c

index 303b0cf7560784cef55c23f147d51f34eda09b73..2707334dd52c0dee4609129b59fe430e1a2e488a 100644 (file)
@@ -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
                {
index 329cc24dd6e67e4de895d29e53c71b8b82034f9f..766ba95be1fb65fd66cc8fb042c7fe92993fd362 100644 (file)
@@ -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);
index ff8e714074f513d996d632c26ad494a2da34be62..e192c7247767d4873a289fb0757438cebc6657f0 100644 (file)
@@ -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 */
        }
index 6d10970e7c81f005e08169ff854d5e1bdb5f124e..f5d7b5d85947feb3b63a11048f32e3b47d7a428c 100644 (file)
@@ -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);
index 8d43cd2ade46eddada54e6e4e17e560c3057ad4a..629e309abe57007d95ffcfbd68b0351f20cea74e 100644 (file)
@@ -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, "/");
index a6533bee3dec8746086d261ec9bacf1eb30cbae7..2a1b4299ca89dcd0967ce4971dd9277c83d828fe 100644 (file)
@@ -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);
index 8e2a2530b8fc5dba54c5b1a268e2d73433a45d0d..65ba9103a63ee8432fff1308da01d5ea610f6864 100644 (file)
@@ -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,
index 7f91ff9fcef86b4a50e58670d011e0929d215556..8544d15109a3cf2116eb954590f1cce3c71934de 100644 (file)
@@ -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;
                }