From: Collin Funk <collin.funk1@gmail.com>
Date: Wed, 7 Feb 2024 11:58:02 +0000 (-0800)
Subject: maint: avoid -Wshadow warning under clang
X-Git-Tag: v9.5~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa5d70c0d36cb1bcc9d205007ac6eb6897640e3;p=thirdparty%2Fcoreutils.git

maint: avoid -Wshadow warning under clang

* 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
---

diff --git a/src/env.c b/src/env.c
index ffe8960391..73d9847f4f 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)