External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: vshCmddefOptParse: Remove return value

Browse Source 
The function can't fail so there's no need to return a value or check it
in the callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-11-12 13:49:21 +01:00
parent fde5b4cf9d
commit a1ed7f37ce
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/vsh.c
View File

@ -389,13 +389,11 @@ vshCmddefCheckInternals(vshControl *ctl,
}
/* 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.
* required or need an argument and fill the appropriate caller-provided bitmaps
*/
static int
vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opts_need_arg,
static void
vshCmddefOptParse(const vshCmdDef *cmd,
uint64_t *opts_need_arg,
uint64_t *opts_required)
{
size_t i;
@ -404,7 +402,7 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opts_need_arg,
*opts_required = 0;
if (!cmd->opts)
return 0;
return;
for (i = 0; cmd->opts[i].name; i++) {
const vshCmdOptDef *opt = &cmd->opts[i];
@ -421,8 +419,6 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opts_need_arg,
if (opt->flags & VSH_OFLAG_REQ)
*opts_required |= 1ULL << i;
}
return 0;
}
static vshCmdOptDef helpopt = {
@ -1388,14 +1384,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial)
tkdata = g_strdup(cmd->alias);
cmd = vshCmddefSearch(tkdata);
}
if (vshCmddefOptParse(cmd, &opts_need_arg,
&opts_required) < 0) {
if (!partial)
vshError(ctl,
_("internal error: bad options in command: '%s'"),
tkdata);
goto syntaxError;
}
vshCmddefOptParse(cmd, &opts_need_arg, &opts_required);
VIR_FREE(tkdata);
} else if (data_only) {
goto get_data;