Commitc742eb3

committed

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

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

1 parent01b23da commitc742eb3Copy full SHA for c742eb3

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

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

Lines changed: 5 additions & 0 deletions

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

Comments

(0)