Re: Build error caused by latest od commit

[Collin Funk]

On 2/7/24 3:14 AM, Pádraig Brady wrote:
> I've added and extra configure check for that and pushed.

Thanks, that seems to have fixed it. GCC 12.2.0 and GCC 13.2.1 seemed
to fail from -Werror=shadow. I attached a patch that should fix it.
Also, I didn't see there was a bug-coreutils mailing list. Would that
be a better place to send patches in the future? Thanks.
From 09aff2babb8323ec125f52494874a33be8987346 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Wed, 7 Feb 2024 03:58:02 -0800
Subject: [PATCH] env: Fix errors caused by -Wshadow.

* src/env.c (parse_signal_action_params, parse_signal_block_params):
Rename optarg to arg so that it does not conflict with optarg used by
getopt.

Copyright-paperwork-exempt: Yes
---
 src/env.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/env.c b/src/env.c
index ffe8960..73d9847 100644
--- a/src/env.c
+++ b/src/env.c
@@ -536,13 +536,13 @@ parse_split_string (char const *str, int *orig_optind,
 }
 
 static void
-parse_signal_action_params (char const *optarg, bool set_default)
+parse_signal_action_params (char const *arg, bool set_default)
 {
   char signame[SIG2STR_MAX];
   char *opt_sig;
   char *optarg_writable;
 
-  if (! optarg)
+  if (! arg)
     {
       /* Without an argument, reset all signals.
          Some signals cannot be set to ignore or default (e.g., SIGKILL,
@@ -553,7 +553,7 @@ parse_signal_action_params (char const *optarg, bool set_default)
       return;
     }
 
-  optarg_writable = xstrdup (optarg);
+  optarg_writable = xstrdup (arg);
 
   opt_sig = strtok (optarg_writable, ",");
   while (opt_sig)
@@ -618,13 +618,13 @@ reset_signal_handlers (void)
 
 
 static void
-parse_block_signal_params (char const *optarg, bool block)
+parse_block_signal_params (char const *arg, bool block)
 {
   char signame[SIG2STR_MAX];
   char *opt_sig;
   char *optarg_writable;
 
-  if (! optarg)
+  if (! arg)
     {
       /* Without an argument, reset all signals.  */
       sigfillset (block ? &block_signals : &unblock_signals);
@@ -639,10 +639,10 @@ parse_block_signal_params (char const *optarg, bool block)
 
   sig_mask_changed = true;
 
-  if (! optarg)
+  if (! arg)
     return;
 
-  optarg_writable = xstrdup (optarg);
+  optarg_writable = xstrdup (arg);
 
   opt_sig = strtok (optarg_writable, ",");
   while (opt_sig)
-- 
2.43.0