Commit28ec316

committed

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

Fix some wrong use and install a safeguard against future mistakes.

1 parent66af5ee commit28ec316Copy full SHA for 28ec316

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -922,7 +922,7 @@ pg_fe_scram_build_secret(const char password, const char *errstr)`
`922`	`922`	`rc=pg_saslprep(password,&prep_password);`
`923`	`923`	`if (rc==SASLPREP_OOM)`
`924`	`924`	`{`
`925`		`-*errstr=_("out of memory");`
	`925`	`+*errstr=libpq_gettext("out of memory");`
`926`	`926`	`returnNULL;`
`927`	`927`	`}`
`928`	`928`	`if (rc==SASLPREP_SUCCESS)`
`@@ -931,7 +931,7 @@ pg_fe_scram_build_secret(const char password, const char *errstr)`
`931`	`931`	`/* Generate a random salt */`
`932`	`932`	`if (!pg_strong_random(saltbuf,SCRAM_DEFAULT_SALT_LEN))`
`933`	`933`	`{`
`934`		`-*errstr=_("could not generate random salt");`
	`934`	`+*errstr=libpq_gettext("could not generate random salt");`
`935`	`935`	`free(prep_password);`
`936`	`936`	`returnNULL;`
`937`	`937`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -881,6 +881,11 @@ extern char libpq_ngettext(const char msgid, const char *msgid_plural, unsigne`
`881`	`881`	`#definelibpq_gettext(x) (x)`
`882`	`882`	`#definelibpq_ngettext(s,p,n) ((n) == 1 ? (s) : (p))`
`883`	`883`	`#endif`
	`884`	`+/*`
	`885`	`+ * libpq code should use the above, not _(), since that would use the`
	`886`	`+ * surrounding programs's message catalog.`
	`887`	`+ */`
	`888`	`+#undef _`
`884`	`889`
`885`	`890`	`/*`
`886`	`891`	`* These macros are needed to let error-handling code be portable between`

Comments

(0)