From bf3658d77821d5f4ae281515418947313e569fd1 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 29 Jun 2015 10:25:07 -0700 Subject: [PATCH] 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] --- src/numfmt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/numfmt.c b/src/numfmt.c index 09cdd42..e58972b 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -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; } -- 2.3.7