opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refer to bug report address by symbol rather than hardcoding 

Use the PACKAGE_BUGREPORT macro that is created by Autoconf for
referring to the bug reporting address rather than hardcoding it
everywhere.  This makes it easier to change the address and it reduces
translation work.

Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Discussion: https://www.postgresql.org/message-id/flat/8d389c5f-7fb5-8e48-9a4a-68cec44786fa%402ndquadrant.com
This commit is contained in:
Peter Eisentraut 2020-02-28 08:54:49 +01:00
parent afb5465e0c
commit 864934131e
36 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -79,7 +79,7 @@ PostgreSQL has apparently not been ported to your platform yet.
To try a manual configuration, look into the src/template directory
for a similar platform and use the '--with-template=' option.
Please also contact <pgsql-bugs@lists.postgresql.org> to see about
Please also contact <]AC_PACKAGE_BUGREPORT[> to see about
rectifying this. Include the above 'checking host system type...'
line.
*******************************************************************

4
contrib/oid2name/oid2name.c
View File

@ -219,8 +219,8 @@ help(const char *progname)
" -p, --port=PORT database server port number\n"
" -U, --username=USERNAME connect as specified database user\n"
"\nThe default action is to show all database OIDs.\n\n"
"Report bugs to <pgsql-bugs@lists.postgresql.org>.\n",
progname, progname);
"Report bugs to <%s>.\n",
progname, progname, PACKAGE_BUGREPORT);
}
/*

2
contrib/pg_standby/pg_standby.c
View File

@ -612,7 +612,7 @@ usage(void)
" restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n"
"e.g.\n"
" restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n");
printf("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n");
printf("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
}
#ifndef WIN32

2
contrib/vacuumlo/vacuumlo.c
View File

@ -436,7 +436,7 @@ usage(const char *progname)
printf(" -w, --no-password never prompt for password\n");
printf(" -W, --password force password prompt\n");
printf("\n");
printf("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n");
printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
}

2
src/backend/main/main.c
View File

@ -359,7 +359,7 @@ help(const char *progname)
printf(_("\nPlease read the documentation for the complete list of run-time\n"
"configuration settings and how to set them on the command line or in\n"
"the configuration file.\n\n"
"Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
"Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/backend/postmaster/postmaster.c
View File

@ -5141,7 +5141,7 @@ ExitPostmaster(int status)
ereport(LOG,
(errcode(ERRCODE_INTERNAL_ERROR),
errmsg_internal("postmaster became multithreaded"),
errdetail("Please report this to <pgsql-bugs@lists.postgresql.org>.")));
errdetail("Please report this to <%s>.", PACKAGE_BUGREPORT)));
#endif
/* should cleanup shared memory and kill all backends */

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

@ -2322,7 +2322,7 @@ usage(const char *progname)
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"
"is used.\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
static void

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

@ -269,7 +269,7 @@ usage(void)
"Or for use as a standalone archive cleaner:\n"
"e.g.\n"
" pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
/*------------ MAIN ----------------------------------------*/

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

@ -396,7 +396,7 @@ usage(void)
printf(_(" -U, --username=NAME connect as specified database user\n"));
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt (should happen automatically)\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/pg_basebackup/pg_receivewal.c
View File

@ -102,7 +102,7 @@ usage(void)
printf(_("\nOptional actions:\n"));
printf(_(" --create-slot create a new replication slot (for the slot's name see --slot)\n"));
printf(_(" --drop-slot drop the replication slot (for the slot's name see --slot)\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
static bool

2
src/bin/pg_basebackup/pg_recvlogical.c
View File

@ -103,7 +103,7 @@ usage(void)
printf(_(" -U, --username=NAME connect as specified database user\n"));
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt (should happen automatically)\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
/*

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

@ -88,7 +88,7 @@ usage(void)
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nIf no data directory (DATADIR) is specified, "
"the environment variable PGDATA\nis used.\n\n"));
printf(_("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
/*

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

@ -102,7 +102,7 @@ help(void)
printf(_(" --version show the PostgreSQL version\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nWith no arguments, all known items are shown.\n\n"));
printf(_("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
static void

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

@ -41,7 +41,7 @@ usage(const char *progname)
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nIf no data directory (DATADIR) is specified, "
"the environment variable PGDATA\nis used.\n\n"));
printf(_("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

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

@ -2095,7 +2095,7 @@ do_help(void)
printf(_(" demand start service on demand\n"));
#endif
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

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

@ -1047,7 +1047,7 @@ help(const char *progname)
printf(_("\nIf no database name is supplied, then the PGDATABASE environment\n"
"variable value is used.\n\n"));
printf(_("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
static void

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

@ -670,7 +670,7 @@ help(void)
printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"
"output.\n\n"));
printf(_("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

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

@ -519,5 +519,5 @@ usage(const char *progname)
"The options -I, -n, -N, -P, -t, -T, and --section can be combined and specified\n"
"multiple times to select multiple objects.\n"));
printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));
printf(_("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

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

@ -1223,5 +1223,5 @@ usage(void)
printf(_(" -x, --next-transaction-id=XID set next transaction ID\n"));
printf(_(" --wal-segsize=SIZE size of WAL segments, in megabytes\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

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

@ -87,7 +87,7 @@ usage(const char *progname)
printf(_(" --debug write a lot of debug messages\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/pg_upgrade/option.c
View File

@ -336,7 +336,7 @@ usage(void)
" C:\\> set PGBINNEW=newCluster/bin\n"
" C:\\> pg_upgrade\n"));
#endif
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

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

@ -730,7 +730,7 @@ usage(void)
printf(_(" -z, --stats[=record] show statistics instead of records\n"
" (optionally, show per-record statistics)\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
int

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

@ -681,8 +681,8 @@ usage(void)
" -V, --version output version information, then exit\n"
" -?, --help show this help, then exit\n"
"\n"
"Report bugs to <pgsql-bugs@lists.postgresql.org>.\n",
progname, progname);
"Report bugs to <%s>.\n",
progname, progname, PACKAGE_BUGREPORT);
}
/* return whether str matches "^\s*[-+]?[0-9]+$" */

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

@ -144,7 +144,7 @@ usage(unsigned short int pager)
fprintf(output, _("\nFor more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
"commands) from within psql, or consult the psql section in the PostgreSQL\n"
"documentation.\n\n"));
fprintf(output, _("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
fprintf(output, _("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
ClosePager(output);
}

2
src/bin/scripts/clusterdb.c
View File

@ -291,5 +291,5 @@ help(const char *progname)
printf(_(" -W, --password force password prompt\n"));
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nRead the description of the SQL command CLUSTER for details.\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/scripts/createdb.c
View File

@ -277,5 +277,5 @@ help(const char *progname)
printf(_(" -W, --password force password prompt\n"));
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nBy default, a database with the same name as the current user is created.\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/scripts/createuser.c
View File

@ -375,5 +375,5 @@ help(const char *progname)
printf(_(" -U, --username=USERNAME user name to connect as (not the one to create)\n"));
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/scripts/dropdb.c
View File

@ -177,5 +177,5 @@ help(const char *progname)
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt\n"));
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/scripts/dropuser.c
View File

@ -175,5 +175,5 @@ help(const char *progname)
printf(_(" -U, --username=USERNAME user name to connect as (not the one to drop)\n"));
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/scripts/pg_isready.c
View File

@ -235,5 +235,5 @@ help(const char *progname)
printf(_(" -p, --port=PORT database server port\n"));
printf(_(" -t, --timeout=SECS seconds to wait when attempting connection, 0 disables (default: %s)\n"), DEFAULT_CONNECT_TIMEOUT);
printf(_(" -U, --username=USERNAME user name to connect as\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/scripts/reindexdb.c
View File

@ -774,5 +774,5 @@ help(const char *progname)
printf(_(" -W, --password force password prompt\n"));
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/bin/scripts/vacuumdb.c
View File

@ -949,5 +949,5 @@ help(const char *progname)
printf(_(" -W, --password force password prompt\n"));
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nRead the description of the SQL command VACUUM for details.\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}

2
src/interfaces/ecpg/preproc/ecpg.c
View File

@ -58,7 +58,7 @@ help(const char *progname)
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n"
"input file name, after stripping off .pgc if present.\n"));
printf(_("\nReport bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
static void

2
src/interfaces/ecpg/preproc/pgc.l
View File

@ -1429,7 +1429,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
}
}
<INITIAL>{other}|\n { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <pgsql-bugs@lists.postgresql.org>"); }
<INITIAL>{other}|\n { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <%s>", PACKAGE_BUGREPORT); }
%%

4
src/interfaces/ecpg/preproc/type.c
View File

@ -301,7 +301,7 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype *type, const int brac
break;
default:
if (!IS_SIMPLE_TYPE(type->u.element->type))
base_yyerror("internal error: unknown datatype, please report this to <pgsql-bugs@lists.postgresql.org>");
base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">");
ECPGdump_a_simple(o, name,
type->u.element->type,
@ -672,7 +672,7 @@ ECPGfree_type(struct ECPGtype *type)
break;
default:
if (!IS_SIMPLE_TYPE(type->u.element->type))
base_yyerror("internal error: unknown datatype, please report this to <pgsql-bugs@lists.postgresql.org>");
base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">");
free(type->u.element);
}

2
src/test/regress/pg_regress.c
View File

@ -2071,7 +2071,7 @@ help(void)
printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n"));
printf(_("if the tests could not be run for some reason.\n"));
printf(_("\n"));
printf(_("Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
int