mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpq code should use libpq_gettext(), not _()

Browse Source 
Fix some wrong use and install a safeguard against future mistakes.
This commit is contained in:
Peter Eisentraut 2022-08-25 20:46:58 +02:00
parent 66af5eea31
commit 28ec316787
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/libpq/fe-auth-scram.c
View File

@ -922,7 +922,7 @@ pg_fe_scram_build_secret(const char *password, const char **errstr)
rc = pg_saslprep(password, &prep_password); rc = pg_saslprep(password, &prep_password);
if (rc == SASLPREP_OOM) if (rc == SASLPREP_OOM)
{ {
*errstr = _("out of memory"); *errstr = libpq_gettext("out of memory");
return NULL; return NULL;
} }
if (rc == SASLPREP_SUCCESS) if (rc == SASLPREP_SUCCESS)
@ -931,7 +931,7 @@ pg_fe_scram_build_secret(const char *password, const char **errstr)
/* Generate a random salt */ /* Generate a random salt */
if (!pg_strong_random(saltbuf, SCRAM_DEFAULT_SALT_LEN)) if (!pg_strong_random(saltbuf, SCRAM_DEFAULT_SALT_LEN))
{ {
*errstr = _("could not generate random salt"); *errstr = libpq_gettext("could not generate random salt");
free(prep_password); free(prep_password);
return NULL; return NULL;
} }

5
src/interfaces/libpq/libpq-int.h
View File

@ -881,6 +881,11 @@ extern char *libpq_ngettext(const char *msgid, const char *msgid_plural, unsigne
#define libpq_gettext(x) (x) #define libpq_gettext(x) (x)
#define libpq_ngettext(s, p, n) ((n) == 1 ? (s) : (p)) #define libpq_ngettext(s, p, n) ((n) == 1 ? (s) : (p))
#endif #endif
/*
* libpq code should use the above, not _(), since that would use the
* surrounding programs's message catalog.
*/
#undef _
/* /*
* These macros are needed to let error-handling code be portable between * These macros are needed to let error-handling code be portable between