c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

pg_dump: Refactor messages

Browse source 
This reduces the number of separate messages for translation.
This commit is contained in:
Peter Eisentraut 2021-10-30 19:05:12 +02:00
parent e6c60719e6
commit fd2706589a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/bin/pg_dump/pg_dump.c
View file

@ -4563,7 +4563,7 @@ dumpSubscription(Archive *fout, const SubscriptionInfo *subinfo)
/* Build list of quoted publications and append them to query. */ /* Build list of quoted publications and append them to query. */
if (!parsePGArray(subinfo->subpublications, &pubnames, &npubnames)) if (!parsePGArray(subinfo->subpublications, &pubnames, &npubnames))
fatal("could not parse subpublications array"); fatal("could not parse %s array", "subpublications");
publications = createPQExpBuffer(); publications = createPQExpBuffer();
for (i = 0; i < npubnames; i++) for (i = 0; i < npubnames; i++)
@ -12238,7 +12238,7 @@ dumpFunc(Archive *fout, const FuncInfo *finfo)
if (!parsePGArray(proallargtypes, &allargtypes, &nitems) || if (!parsePGArray(proallargtypes, &allargtypes, &nitems) ||
nitems < finfo->nargs) nitems < finfo->nargs)
{ {
pg_log_warning("could not parse proallargtypes array"); pg_log_warning("could not parse %s array", "proallargtypes");
if (allargtypes) if (allargtypes)
free(allargtypes); free(allargtypes);
allargtypes = NULL; allargtypes = NULL;
@ -12254,7 +12254,7 @@ dumpFunc(Archive *fout, const FuncInfo *finfo)
if (!parsePGArray(proargmodes, &argmodes, &nitems) || if (!parsePGArray(proargmodes, &argmodes, &nitems) ||
nitems != nallargs) nitems != nallargs)
{ {
pg_log_warning("could not parse proargmodes array"); pg_log_warning("could not parse %s array", "proargmodes");
if (argmodes) if (argmodes)
free(argmodes); free(argmodes);
argmodes = NULL; argmodes = NULL;
@ -12268,7 +12268,7 @@ dumpFunc(Archive *fout, const FuncInfo *finfo)
if (!parsePGArray(proargnames, &argnames, &nitems) || if (!parsePGArray(proargnames, &argnames, &nitems) ||
nitems != nallargs) nitems != nallargs)
{ {
pg_log_warning("could not parse proargnames array"); pg_log_warning("could not parse %s array", "proargnames");
if (argnames) if (argnames)
free(argnames); free(argnames);
argnames = NULL; argnames = NULL;
@ -12278,7 +12278,7 @@ dumpFunc(Archive *fout, const FuncInfo *finfo)
if (proconfig && *proconfig) if (proconfig && *proconfig)
{ {
if (!parsePGArray(proconfig, &configitems, &nconfigitems)) if (!parsePGArray(proconfig, &configitems, &nconfigitems))
fatal("could not parse proconfig array"); fatal("could not parse %s array", "proconfig");
} }
else else
{ {
@ -18190,9 +18190,9 @@ processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
int j; int j;
if (!parsePGArray(extconfig, &extconfigarray, &nconfigitems)) if (!parsePGArray(extconfig, &extconfigarray, &nconfigitems))
fatal("could not parse extension configuration array"); fatal("could not parse %s array", "extconfig");
if (!parsePGArray(extcondition, &extconditionarray, &nconditionitems)) if (!parsePGArray(extcondition, &extconditionarray, &nconditionitems))
fatal("could not parse extension condition array"); fatal("could not parse %s array", "extcondition");
if (nconfigitems != nconditionitems) if (nconfigitems != nconditionitems)
fatal("mismatched number of configurations and conditions for extension"); fatal("mismatched number of configurations and conditions for extension");
@ -18820,5 +18820,5 @@ appendReloptionsArrayAH(PQExpBuffer buffer, const char *reloptions,
res = appendReloptionsArray(buffer, reloptions, prefix, fout->encoding, res = appendReloptionsArray(buffer, reloptions, prefix, fout->encoding,
fout->std_strings); fout->std_strings);
if (!res) if (!res)
pg_log_warning("could not parse reloptions array"); pg_log_warning("could not parse %s array", "reloptions");
} }