lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1457947807-4804-1-git-send-email-kan.liang@intel.com> Date: Mon, 14 Mar 2016 02:30:03 -0700 From: kan.liang@...el.com To: bwh@...nel.org Cc: davem@...emloft.net, nicolas.dichtel@...nd.com, ben@...adent.org.uk, jesse.brandeburg@...el.com, andi@...stfloor.org, netdev@...r.kernel.org, Kan Liang <kan.liang@...el.com> Subject: [PATCH 1/5] ethtool: move option parsing related codes into function From: Kan Liang <kan.liang@...el.com> Move option parsing code into find_option function. No behavior changes. Signed-off-by: Kan Liang <kan.liang@...el.com> --- ethtool.c | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/ethtool.c b/ethtool.c index 0cd0d4f..bd0583c 100644 --- a/ethtool.c +++ b/ethtool.c @@ -4223,6 +4223,29 @@ static int show_usage(struct cmd_context *ctx) return 0; } +static int find_option(int argc, char **argp) +{ + const char *opt; + size_t len; + int k; + + for (k = 0; args[k].opts; k++) { + opt = args[k].opts; + for (;;) { + len = strcspn(opt, "|"); + if (strncmp(*argp, opt, len) == 0 && + (*argp)[len] == 0) + return k; + + if (opt[len] == 0) + break; + opt += len + 1; + } + } + + return -1; +} + int main(int argc, char **argp) { int (*func)(struct cmd_context *); @@ -4240,24 +4263,14 @@ int main(int argc, char **argp) */ if (argc == 0) exit_bad_args(); - for (k = 0; args[k].opts; k++) { - const char *opt; - size_t len; - opt = args[k].opts; - for (;;) { - len = strcspn(opt, "|"); - if (strncmp(*argp, opt, len) == 0 && - (*argp)[len] == 0) { - argp++; - argc--; - func = args[k].func; - want_device = args[k].want_device; - goto opt_found; - } - if (opt[len] == 0) - break; - opt += len + 1; - } + + k = find_option(argc, argp); + if (k > 0) { + argp++; + argc--; + func = args[k].func; + want_device = args[k].want_device; + goto opt_found; } if ((*argp)[0] == '-') exit_bad_args(); -- 2.5.0
Powered by blists - more mailing lists