database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

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

Browse Source 
Commit 112faf1378 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 213c959a29.

To fix the issue, this commit removes the translation marker from
libpq-be-fe-helpers.h, following the approach used in 213c959a29.
It also removes the associated gettext_noop() calls added in commit
112faf1378, 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
This commit is contained in:
Fujii Masao
2025-07-22 22:08:36 +09:00
parent d3f97fd1dd
commit a7ca73af66
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/basic_archive/basic_archive.c
View File

@ -65,7 +65,7 @@ void
_PG_init(void) _PG_init(void)
{ {
DefineCustomStringVariable("basic_archive.archive_directory", DefineCustomStringVariable("basic_archive.archive_directory",
gettext_noop("Archive file destination directory."), "Archive file destination directory.",
NULL, NULL,
&archive_directory, &archive_directory,
"", "",

4
contrib/dblink/dblink.c
View File

@ -242,7 +242,7 @@ dblink_get_conn(char *conname_or_str,
} }
PQsetNoticeReceiver(conn, libpqsrv_notice_receiver, PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,
gettext_noop("received message via remote connection")); "received message via remote connection");
dblink_security_check(conn, NULL, connstr); dblink_security_check(conn, NULL, connstr);
if (PQclientEncoding(conn) != GetDatabaseEncoding()) if (PQclientEncoding(conn) != GetDatabaseEncoding())
@ -343,7 +343,7 @@ dblink_connect(PG_FUNCTION_ARGS)
} }
PQsetNoticeReceiver(conn, libpqsrv_notice_receiver, PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,
gettext_noop("received message via remote connection")); "received message via remote connection");
/* check password actually used if not superuser */ /* check password actually used if not superuser */
dblink_security_check(conn, connname, connstr); dblink_security_check(conn, connname, connstr);

2
contrib/postgres_fdw/connection.c
View File

@ -626,7 +626,7 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); errdetail_internal("%s", pchomp(PQerrorMessage(conn)))));
PQsetNoticeReceiver(conn, libpqsrv_notice_receiver, PQsetNoticeReceiver(conn, libpqsrv_notice_receiver,
gettext_noop("received message via remote connection")); "received message via remote connection");
/* Perform post-connection security checks. */ /* Perform post-connection security checks. */
pgfdw_security_check(keywords, values, user, conn); pgfdw_security_check(keywords, values, user, conn);

2
src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
View File

@ -233,7 +233,7 @@ libpqrcv_connect(const char *conninfo, bool replication, bool logical,
} }
PQsetNoticeReceiver(conn->streamConn, libpqsrv_notice_receiver, 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 * Set always-secure search path for the cases where the connection is

2
src/include/libpq/libpq-be-fe-helpers.h
View File

@ -481,7 +481,7 @@ libpqsrv_notice_receiver(void *arg, const PGresult *res)
len--; len--;
ereport(LOG, ereport(LOG,
errmsg_internal("%s: %.*s", _(prefix), len, message)); errmsg_internal("%s: %.*s", prefix, len, message));
} }
#endif /* LIBPQ_BE_FE_HELPERS_H */ #endif /* LIBPQ_BE_FE_HELPERS_H */