diff mbox series

[03/33] fix unused parameter warning in find_option()

Message ID	20191017182121.103569-3-zenczykowski@gmail.com
State	Accepted
Delegated to:	John Linville
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: =?utf-8?q?Maciej_=C5=BBenczykowski?= <zenczykowski@gmail.com> To: =?utf-8?q?Maciej_=C5=BBenczykowski?= <maze@google.com>, "John W . Linville" <linville@tuxdriver.com> Cc: netdev@vger.kernel.org Subject: [PATCH 03/33] fix unused parameter warning in find_option() Date: Thu, 17 Oct 2019 11:20:51 -0700 Message-Id: <20191017182121.103569-3-zenczykowski@gmail.com> In-Reply-To: <20191017182121.103569-1-zenczykowski@gmail.com> References: <CAHo-Ooze4yTO_yeimV-XSD=AXvvd0BmbKdvUK4bKWN=+LXirYQ@mail.gmail.com> <20191017182121.103569-1-zenczykowski@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	[01/33] fix arithmetic on pointer to void is a GNU extension warning \| expand [01/33] fix arithmetic on pointer to void is a GNU extension warning [02/33] fix unused parameter warnings in do_version() and show_usage() [03/33] fix unused parameter warning in find_option() [04/33] fix unused parameter warning in dump_eeprom() [05/33] fix unused parameter warning in altera_tse_dump_regs() [06/33] fix unused parameter warning in sfc_dump_regs() [07/33] fix unused parameter warning in print_simple_table() [08/33] fix unused parameter warning in natsemi_dump_regs() [09/33] fix unused parameter warning in netsemi_dump_eeprom() [10/33] fix unused parameter warning in ixgbe_dump_regs() [11/33] fix unused parameter warning in realtek_dump_regs() [12/33] fix unused parameter warning in lan78xx_dump_regs() [13/33] fix unused parameter warning in {skge,sky2}_dump_regs() [14/33] fix unused parameter warning in dsa_dump_regs() [15/33] fix unused parameter warning in vmxnet3_dump_regs() [16/33] fix unused parameter warning in st_{mac100,gmac}_dump_regs() [17/33] fix unused parameter warning in ixgbevf_dump_regs() [18/33] fix unused parameter warning in fec_8xx_dump_regs() [19/33] fix unused parameter warning in tg3_dump_{eeprom,regs}() [20/33] fix unused parameter warning in vioc_dump_regs() [21/33] fix unused parameter warning in e100_dump_regs() [22/33] fix unused parameter warning in de2104[01]_dump_regs() [23/33] fix unused parameter warning in igb_dump_regs() [24/33] fix unused parameter warning in e1000_dump_regs() [25/33] fix unused parameter warning in smsc911x_dump_regs() [26/33] fix unused parameter warning in at76c50x_usb_dump_regs() [27/33] fix unused parameter warning in fec_dump_regs() [28/33] fix unused parameter warning in amd8111e_dump_regs() [29/33] fix unused parameter warning in et131x_dump_regs() [30/33] fix unused parameter warning in ibm_emac_dump_regs() [31/33] fix unused parameter warning in ixgb_dump_regs() [32/33] fix unused parameter warning in fjes_dump_regs() [33/33] fix unused parameter warning in e1000_get_mac_type()

Commit Message

Maciej Żenczykowski Oct. 17, 2019, 6:20 p.m. UTC

From: Maciej Żenczykowski <maze@google.com>

This fixes:
  external/ethtool/ethtool.c:5417:28: error: unused parameter 'argc' [-Werror,-Wunused-parameter]
  static int find_option(int argc, char **argp)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7782cac5f58e217fc6032037a2f248b03573b9d4
---
 ethtool.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/ethtool.c b/ethtool.c
index 5e0deda..0f3fe7f 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -5507,7 +5507,7 @@  static int show_usage(struct cmd_context *ctx maybe_unused)
 	return 0;
 }
 
-static int find_option(int argc, char **argp)
+static int find_option(char *arg)
 {
 	const char *opt;
 	size_t len;
@@ -5517,8 +5517,7 @@  static int find_option(int argc, char **argp)
 		opt = args[k].opts;
 		for (;;) {
 			len = strcspn(opt, "|");
-			if (strncmp(*argp, opt, len) == 0 &&
-			    (*argp)[len] == 0)
+			if (strncmp(arg, opt, len) == 0 && arg[len] == 0)
 				return k;
 
 			if (opt[len] == 0)
@@ -5667,7 +5666,7 @@  static int do_perqueue(struct cmd_context *ctx)
 		ctx->argp++;
 	}
 
-	i = find_option(ctx->argc, ctx->argp);
+	i = find_option(ctx->argp[0]);
 	if (i < 0)
 		exit_bad_args();
 
@@ -5719,7 +5718,7 @@  int main(int argc, char **argp)
 	if (argc == 0)
 		exit_bad_args();
 
-	k = find_option(argc, argp);
+	k = find_option(*argp);
 	if (k >= 0) {
 		argp++;
 		argc--;