From 45a739038d9c0c7c948f771da7c0b946b7cab5d7 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Fri, 16 Sep 2016 10:17:46 +0200 Subject: [PATCH] vsh: discard vshCmddefOptFill and move its body to vshCmddefOptParse Recent changes extracted the command internals validation routine from vshCmddefOptParse method which now just calls vshCmddefOptFill. Therefore, make vshCmddefOptFill the new vshCmddefOptParse and drop the unnecessary name. Signed-off-by: Erik Skultety --- tools/vsh.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 1cf929424b..008d890443 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -378,10 +378,15 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) return 0; } -/* Keeps track of options that are required or need and argument */ +/* Parse the options associated with @cmd, i.e. test whether options are + * required or need an argument. + * + * Returns -1 on error or 0 on success, filling the caller-provided bitmaps + * which keep track of required options and options needing an argument. + */ static int -vshCmddefOptFill(const vshCmdDef *cmd, uint64_t *opts_need_arg, - uint64_t *opts_required) +vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opts_need_arg, + uint64_t *opts_required) { size_t i; bool optional = false; @@ -420,16 +425,6 @@ vshCmddefOptFill(const vshCmdDef *cmd, uint64_t *opts_need_arg, optional = true; } } - return 0; -} - -/* Validate that the options associated with cmd can be parsed. */ -static int -vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opts_need_arg, - uint64_t *opts_required) -{ - if (vshCmddefOptFill(cmd, opts_need_arg, opts_required) < 0) - return -1; return 0; } @@ -2713,8 +2708,8 @@ vshReadlineParse(const char *text, int state) goto error; cmd_exists = true; - if (vshCmddefOptFill(cmd, &const_opts_need_arg, - &const_opts_required) < 0) + if (vshCmddefOptParse(cmd, &const_opts_need_arg, + &const_opts_required) < 0) goto error; opts_need_arg = const_opts_need_arg; opts_seen = const_opts_seen;