mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small message fixes

Browse Source
This commit is contained in:
Peter Eisentraut 2014-08-09 00:07:00 -04:00
parent 3dad73e71f
commit f25e0bf5e0
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/initdb/initdb.c
View File

@ -2548,7 +2548,7 @@ check_locale_name(int category, const char *locale, char **canonname)
save = setlocale(category, NULL); save = setlocale(category, NULL);
if (!save) if (!save)
{ {
fprintf(stderr, _("%s: setlocale failed\n"), fprintf(stderr, _("%s: setlocale() failed\n"),
progname); progname);
exit(1); exit(1);
} }

4
src/bin/pg_basebackup/pg_basebackup.c
View File

@ -1123,13 +1123,13 @@ update_tablespace_symlink(Oid oid, const char *old_dir)
if (unlink(linkloc) != 0 && errno != ENOENT) if (unlink(linkloc) != 0 && errno != ENOENT)
{ {
fprintf(stderr, _("%s: could not remove symbolic link \"%s\": %s"), fprintf(stderr, _("%s: could not remove symbolic link \"%s\": %s\n"),
progname, linkloc, strerror(errno)); progname, linkloc, strerror(errno));
disconnect_and_exit(1); disconnect_and_exit(1);
} }
if (symlink(new_dir, linkloc) != 0) if (symlink(new_dir, linkloc) != 0)
{ {
fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s"), fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s\n"),
progname, linkloc, strerror(errno)); progname, linkloc, strerror(errno));
disconnect_and_exit(1); disconnect_and_exit(1);
} }

2
src/bin/pg_dump/pg_backup_tar.c
View File

@ -1083,7 +1083,7 @@ _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th)
fseeko(tmp, 0, SEEK_END); fseeko(tmp, 0, SEEK_END);
th->fileLen = ftello(tmp); th->fileLen = ftello(tmp);
if (th->fileLen < 0) if (th->fileLen < 0)
exit_horribly(modulename, "could not determine seek position in file: %s\n", exit_horribly(modulename, "could not determine seek position in archive file: %s\n",
strerror(errno)); strerror(errno));
fseeko(tmp, 0, SEEK_SET); fseeko(tmp, 0, SEEK_SET);

2
src/bin/pg_dump/pg_dump.c
View File

@ -582,7 +582,7 @@ main(int argc, char **argv)
} }
if (if_exists && !outputClean) if (if_exists && !outputClean)
exit_horribly(NULL, "option --if-exists requires -c/--clean option\n"); exit_horribly(NULL, "option --if-exists requires option -c/--clean\n");
/* Identify archive format to emit */ /* Identify archive format to emit */
archiveFormat = parseArchiveFormat(format, &archiveMode); archiveFormat = parseArchiveFormat(format, &archiveMode);

2
src/bin/pg_dump/pg_dumpall.c
View File

@ -338,7 +338,7 @@ main(int argc, char *argv[])
if (if_exists && !output_clean) if (if_exists && !output_clean)
{ {
fprintf(stderr, _("%s: option --if-exists requires -c/--clean option\n"), fprintf(stderr, _("%s: option --if-exists requires option -c/--clean\n"),
progname); progname);
exit_nicely(1); exit_nicely(1);
} }

2
src/bin/pg_dump/pg_restore.c
View File

@ -340,7 +340,7 @@ main(int argc, char **argv)
if (if_exists && !opts->dropSchema) if (if_exists && !opts->dropSchema)
{ {
fprintf(stderr, _("%s: option --if-exists requires -c/--clean option\n"), fprintf(stderr, _("%s: option --if-exists requires option -c/--clean\n"),
progname); progname);
exit_nicely(1); exit_nicely(1);
} }

2
src/bin/pg_resetxlog/pg_resetxlog.c
View File

@ -683,7 +683,7 @@ PrintNewControlValues()
if (set_xid_epoch != -1) if (set_xid_epoch != -1)
{ {
printf(_("NextXID Epoch: %u\n"), printf(_("NextXID epoch: %u\n"),
ControlFile.checkPointCopy.nextXidEpoch); ControlFile.checkPointCopy.nextXidEpoch);
} }
} }

2
src/bin/psql/command.c
View File

@ -2509,7 +2509,7 @@ printPsetInfo(const char *param, struct printQueryOpt *popt)
if (popt->topt.default_footer) if (popt->topt.default_footer)
printf(_("Default footer (%s) is on.\n"), param); printf(_("Default footer (%s) is on.\n"), param);
else else
printf(_("Default footer (%s) is off."), param); printf(_("Default footer (%s) is off.\n"), param);
} }
/* show format */ /* show format */

2
src/common/username.c
View File

@ -42,7 +42,7 @@ get_user_name(char **errstr)
pw = getpwuid(user_id); pw = getpwuid(user_id);
if (!pw) if (!pw)
{ {
*errstr = psprintf(_("failed to look up effective user id %ld: %s"), *errstr = psprintf(_("could not look up effective user ID %ld: %s"),
(long) user_id, (long) user_id,
errno ? strerror(errno) : _("user does not exist")); errno ? strerror(errno) : _("user does not exist"));
return NULL; return NULL;

6
src/pl/plpgsql/src/pl_handler.c
View File

@ -153,7 +153,7 @@ _PG_init(void)
NULL, NULL, NULL); NULL, NULL, NULL);
DefineCustomBoolVariable("plpgsql.print_strict_params", DefineCustomBoolVariable("plpgsql.print_strict_params",
gettext_noop("Print information about parameters in the DETAIL part of the error messages generated on INTO .. STRICT failures."), gettext_noop("Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."),
NULL, NULL,
&plpgsql_print_strict_params, &plpgsql_print_strict_params,
false, false,
@ -161,7 +161,7 @@ _PG_init(void)
NULL, NULL, NULL); NULL, NULL, NULL);
DefineCustomStringVariable("plpgsql.extra_warnings", DefineCustomStringVariable("plpgsql.extra_warnings",
gettext_noop("List of programming constructs which should produce a warning."), gettext_noop("List of programming constructs that should produce a warning."),
NULL, NULL,
&plpgsql_extra_warnings_string, &plpgsql_extra_warnings_string,
"none", "none",
@ -171,7 +171,7 @@ _PG_init(void)
NULL); NULL);
DefineCustomStringVariable("plpgsql.extra_errors", DefineCustomStringVariable("plpgsql.extra_errors",
gettext_noop("List of programming constructs which should produce an error."), gettext_noop("List of programming constructs that should produce an error."),
NULL, NULL,
&plpgsql_extra_errors_string, &plpgsql_extra_errors_string,
"none", "none",