Remove translation marker from libpq-be-fe-helpers.h.

MasaoFujii · MasaoFujii · commit a7ca73af662b · 2025-07-22T22:08:36.000+09:00
Commit 112faf1 introduced a translation marker in libpq-be-fe-helpers.h, but this caused build failures on some platforms—such as the one reported by buildfarm member indri—due to linker issues with dblink. This is the same problem previously addressed in commit 213c959. To fix the issue, this commit removes the translation marker from libpq-be-fe-helpers.h, following the approach used in 213c959. It also removes the associated gettext_noop() calls added in commit 112faf1, as they are no longer needed. While reviewing this, a gettext_noop() call was also found in contrib/basic_archive. Since contrib modules don't support translation, this call has been removed as well. Per buildfarm member indri. Author: Fujii Masao <masao.fujii@gmail.com> Reviewed-by: Álvaro Herrera <alvherre@kurilemu.de> Discussion: https://postgr.es/m/0e6299d9-608a-4ffa-aeb1-40cb8a99000b@oss.nttdata.com
diff --git a/contrib/basic_archive/basic_archive.c b/contrib/basic_archive/basic_archive.c
@@ -65,7 +65,7 @@ void
 _PG_init(void)
 {
 	DefineCustomStringVariable("basic_archive.archive_directory",
-							   gettext_noop("Archive file destination directory."),
+							   "Archive file destination directory.",
 							   NULL,
 							   &archive_directory,
 							   "",
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
@@ -242,7 +242,7 @@ dblink_get_conn(char *conname_or_str,
 		}
 
 		PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,
-							gettext_noop("received message via remote connection"));
+							"received message via remote connection");
 
 		dblink_security_check(conn, NULL, connstr);
 		if (PQclientEncoding(conn) != GetDatabaseEncoding())
@@ -343,7 +343,7 @@ dblink_connect(PG_FUNCTION_ARGS)
 	}
 
 	PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,
-						gettext_noop("received message via remote connection"));
+						"received message via remote connection");
 
 	/* check password actually used if not superuser */
 	dblink_security_check(conn, connname, connstr);
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
@@ -626,7 +626,7 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
 					 errdetail_internal("%s", pchomp(PQerrorMessage(conn)))));
 
 		PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,
-							gettext_noop("received message via remote connection"));
+							"received message via remote connection");
 
 		/* Perform post-connection security checks. */
 		pgfdw_security_check(keywords, values, user, conn);
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -233,7 +233,7 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
 	}
 
 	PQsetNoticeReceiver(conn->streamConn, libpqsrv_notice_receiver,
-						gettext_noop("received message via replication"));
+						"received message via replication");
 
 	/*
 	 * Set always-secure search path for the cases where the connection is
diff --git a/src/include/libpq/libpq-be-fe-helpers.h b/src/include/libpq/libpq-be-fe-helpers.h
@@ -481,7 +481,7 @@ libpqsrv_notice_receiver(void *arg, const PGresult *res)
 		len--;
 
 	ereport(LOG,
-			errmsg_internal("%s: %.*s", _(prefix), len, message));
+			errmsg_internal("%s: %.*s", prefix, len, message));
 }
 
 #endif							/* LIBPQ_BE_FE_HELPERS_H */

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void`
`65`	`65`	`_PG_init(void)`
`66`	`66`	`{`
`67`	`67`	`DefineCustomStringVariable("basic_archive.archive_directory",`
`68`		`- gettext_noop("Archive file destination directory."),`
	`68`	`+ "Archive file destination directory.",`
`69`	`69`	`NULL,`
`70`	`70`	`&archive_directory,`
`71`	`71`	`"",`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ dblink_get_conn(char *conname_or_str,`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,`
`245`		`- gettext_noop("received message via remote connection"));`
	`245`	`+ "received message via remote connection");`
`246`	`246`
`247`	`247`	`dblink_security_check(conn, NULL, connstr);`
`248`	`248`	`if (PQclientEncoding(conn) != GetDatabaseEncoding())`
`@@ -343,7 +343,7 @@ dblink_connect(PG_FUNCTION_ARGS)`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,`
`346`		`- gettext_noop("received message via remote connection"));`
	`346`	`+ "received message via remote connection");`
`347`	`347`
`348`	`348`	`/* check password actually used if not superuser */`
`349`	`349`	`dblink_security_check(conn, connname, connstr);`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`PQsetNoticeReceiver(conn->streamConn, libpqsrv_notice_receiver,`
`236`		`- gettext_noop("received message via replication"));`
	`236`	`+ "received message via replication");`
`237`	`237`
`238`	`238`	`/*`
`239`	`239`	`* Set always-secure search path for the cases where the connection is`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ libpqsrv_notice_receiver(void arg, const PGresult res)`
`481`	`481`	`len--;`
`482`	`482`
`483`	`483`	`ereport(LOG,`
`484`		`- errmsg_internal("%s: %.*s", _(prefix), len, message));`
	`484`	`+ errmsg_internal("%s: %.*s", prefix, len, message));`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`#endif /* LIBPQ_BE_FE_HELPERS_H */`