mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
build: numfmt.c: avoid a shadowing warning
* src/numfmt.c (parse_field_arg): Rename parameter s/optarg/arg/,
to avoid shadowing getopt's global variable.
Otherwise, building on OS X, with --enable-gcc-warnings, I saw this:
In file included from src/numfmt.c:19:0:
src/numfmt.c: In function 'parse_field_arg':
./lib/config.h:3109:25: error: declaration of 'rpl_optarg' shadows\
a global declaration [-Werror=shadow]
This commit is contained in:
1 parent
badecb3f6c
commit
46416bb7c3
1 file changed
+4
-4
+4
-4
@@ -1354,7 +1354,7 @@ free_field (const void *elt)
|
||||
TODO: Refactor the more performant cut implementation
|
||||
for use by both utilities. */
|
||||
static void
|
||||
parse_field_arg (char *optarg)
|
||||
parse_field_arg (char *arg)
|
||||
{
|
||||
|
||||
char *start, *end;
|
||||
@@ -1362,9 +1362,9 @@ parse_field_arg (char *optarg)
|
||||
size_t field_val;
|
||||
size_t range_val = 0;
|
||||
|
||||
start = end = optarg;
|
||||
start = end = arg;
|
||||
|
||||
if (STREQ (optarg, "-"))
|
||||
if (STREQ (arg, "-"))
|
||||
{
|
||||
all_fields = true;
|
||||
|
||||
@@ -1438,7 +1438,7 @@ parse_field_arg (char *optarg)
|
||||
if (range_val)
|
||||
{
|
||||
/* range N-
|
||||
range_val was not reset indicating optarg
|
||||
range_val was not reset indicating ARG
|
||||
ended with a trailing '-' */
|
||||
all_fields_after = range_val;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user