[PATCH 6/8] tools: vshCmddefHelp: Don't call vshCmddefOptParse
The help formatter called vshCmddefOptParse just for validation
purposes. Since vshCmddefOptParse no longer validates the command itself
and we don't need the bitmaps returned by it we can drop the call
entirely.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tools/vsh.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/tools/vsh.c b/tools/vsh.c
index f92759f219..2de940277e 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -606,20 +606,12 @@ vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp)
}
static bool
-vshCmddefHelp(vshControl *ctl, const vshCmdDef *def)
+vshCmddefHelp(const vshCmdDef *def)
{
const char *desc = NULL;
char buf[256];
- uint64_t opts_need_arg;
- uint64_t opts_required;
bool shortopt = false; /* true if 'arg' works instead of '--opt arg'
*/
- if (vshCmddefOptParse(def, &opts_need_arg, &opts_required)) {
- vshError(ctl, _("internal error: bad options in command:
'%s'"),
- def->name);
- return false;
- }
-
fputs(_(" NAME\n"), stdout);
fprintf(stdout, " %s - %s\n", def->name,
_(vshCmddefGetInfo(def, "help")));
@@ -3113,7 +3105,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
if ((def = vshCmddefSearch(name))) {
if (def->flags & VSH_CMD_FLAG_ALIAS)
def = vshCmddefSearch(def->alias);
- return vshCmddefHelp(ctl, def);
+ return vshCmddefHelp(def);
} else if ((grp = vshCmdGrpSearch(name))) {
return vshCmdGrpHelp(ctl, grp);
} else {
--
2.28.0