From e38e2f8a368f713c62822b07b241d97aad08e8be Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Tue, 17 Sep 2024 22:46:58 +0200
Subject: [PATCH] tests: avoid -Wshadow warning

Seen on GCC 14.2.0:

tests/xargs/test-sigusr.c: In function 'run_xargs':
tests/xargs/test-sigusr.c:159:43: warning: declaration of 'optarg' \
  shadows a global declaration [-Wshadow]
  159 | run_xargs(const char *option, const char *optarg, int send_signal)
      |                               ~~~~~~~~~~~~^~~~~~
  ...
  /usr/include/bits/getopt_core.h:36:14: note: shadowed declaration is here
   36 | extern char *optarg;
      |              ^~~~~~

* tests/xargs/test-sigusr.c (run_xargs): Rename 'optarg' parameter
to 'opt_arg'.
---
 tests/xargs/test-sigusr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/xargs/test-sigusr.c b/tests/xargs/test-sigusr.c
index 578d4aff..49e08fb0 100644
--- a/tests/xargs/test-sigusr.c
+++ b/tests/xargs/test-sigusr.c
@@ -156,7 +156,7 @@ struct status
 
 /* Run xargs and return its exit status */
 static struct status
-run_xargs(const char *option, const char *optarg, int send_signal)
+run_xargs(const char *option, const char *opt_arg, int send_signal)
 {
   int i = 0;
   enum { ARGV_MAX = 9 };
@@ -172,9 +172,9 @@ run_xargs(const char *option, const char *optarg, int send_signal)
     {
       argv[i++] = (char*)option;
     }
-  if (optarg)
+  if (opt_arg)
     {
-      argv[i++] = (char*)optarg;
+      argv[i++] = (char*)opt_arg;
     }
   argv[i++] = (char*)"sh";
   argv[i++] = (char*)"-c";