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

petere · petere · commit c742eb36b1eb · 2022-08-25T20:48:20.000+02:00
Fix some wrong use and install a safeguard against future mistakes.
diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
@@ -931,7 +931,7 @@ pg_fe_scram_build_secret(const char *password, const char **errstr)
 	rc = pg_saslprep(password, &prep_password);
 	if (rc == SASLPREP_OOM)
 	{
-		*errstr = _("out of memory");
+		*errstr = libpq_gettext("out of memory");
 		return NULL;
 	}
 	if (rc == SASLPREP_SUCCESS)
@@ -940,7 +940,7 @@ pg_fe_scram_build_secret(const char *password, const char **errstr)
 	/* Generate a random salt */
 	if (!pg_strong_random(saltbuf, SCRAM_DEFAULT_SALT_LEN))
 	{
-		*errstr = _("could not generate random salt");
+		*errstr = libpq_gettext("could not generate random salt");
 		if (prep_password)
 			free(prep_password);
 		return NULL;
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
@@ -880,6 +880,11 @@ extern char *libpq_ngettext(const char *msgid, const char *msgid_plural, unsigne
 #define libpq_gettext(x) (x)
 #define libpq_ngettext(s, p, n) ((n) == 1 ? (s) : (p))
 #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

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`	`return NULL;`
`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`	`return NULL;`