On 2026-Jan-16, David Rowley wrote:
> I think fixing it rather than removing it is the way to go. cc8d41511
> removed the first va arg and didn't update the comment.
>
> git diff cc8d41511~1..cc8d41511 -- */pg_resetwal.c | grep translator -C 3
> @@ -156,13 +157,13 @@ main(int argc, char *argv[])
> {
> /*------
> translator: the second %s is
> a command line argument (-e, etc) */
> - fprintf(stderr, _("%s: invalid
> argument for option %s\n"), progname, "-e");
> + pg_log_error("invalid argument
> for option %s", "-e");
> fprintf(stderr, _("Try \"%s
> --help\" for more information.\n"), progname);
Right. So the fix is to remove the word "second". But there are more
mistakes of the same ilk in the same commit, visible if you remove the
"-- */pg_resetwal.c" part of your command line.
So I propose to park the following in Michael's trivial fixes branch.
diff --git a/src/bin/pg_basebackup/pg_receivewal.c
b/src/bin/pg_basebackup/pg_receivewal.c
index 4f9a7b076ca..ddfec298fb7 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -770,7 +770,7 @@ main(int argc, char **argv)
if (replication_slot == NULL && (do_drop_slot || do_create_slot))
{
- /* translator: second %s is an option name */
+ /* translator: %s is an option name */
pg_log_error("%s needs a slot to be specified using --slot",
do_drop_slot ? "--drop-slot" :
"--create-slot");
pg_log_error_hint("Try \"%s --help\" for more information.",
progname);
diff --git a/src/bin/pg_resetwal/pg_resetwal.c
b/src/bin/pg_resetwal/pg_resetwal.c
index b2c4b9db395..2e3dfd7c94a 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -188,7 +188,7 @@ main(int argc, char *argv[])
if (endptr == optarg || *endptr != '\0' ||
errno != 0)
{
/*------
- translator: the second %s is a
command line argument (-e, etc) */
+ translator: %s is a command line
argument (-e, etc) */
pg_log_error("invalid argument for
option %s", "-e");
pg_log_error_hint("Try \"%s --help\"
for more information.", progname);
exit(1);
--
Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/
"No tengo por qué estar de acuerdo con lo que pienso"
(Carlos Caszeli)
