External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vsh: Unexport command lookup helpers 'vshCmddefSearch', 'vshCmdGrpSearch', 'vshCmdGrpHelp'

Browse Source 
Neither of them is used outside of vsh.c. 'vshCmddefSearch' needed to be
rearranged as it was called earlier in vsh.c than it was defined.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2024-04-15 14:09:04 +02:00
parent 41efec103d
commit 22cf91618d
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tools/vsh.c
View File

@ -239,6 +239,30 @@ vshReportError(vshControl *ctl)
*/ */
static int disconnected; /* we may have been disconnected */ static int disconnected; /* we may have been disconnected */
/* vshCmddefSearch:
* @cmdname: name of command to find
*
* Looks for @cmdname in the global list of command definitions @cmdGroups and
* returns pointer to the definition struct if the command exists.
*/
static const vshCmdDef *
vshCmddefSearch(const char *cmdname)
{
const vshCmdGrp *g;
const vshCmdDef *c;
for (g = cmdGroups; g->name; g++) {
for (c = g->commands; c->name; c++) {
if (STREQ(c->name, cmdname))
return c;
}
}
return NULL;
}
/* Check if the internal command definitions are correct. /* Check if the internal command definitions are correct.
* None of the errors are to be marked as translatable. */ * None of the errors are to be marked as translatable. */
static int static int
@ -600,23 +624,7 @@ vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint64_t opts_required,
return -1; return -1;
} }
const vshCmdDef * static const vshCmdGrp *
vshCmddefSearch(const char *cmdname)
{
const vshCmdGrp *g;
const vshCmdDef *c;
for (g = cmdGroups; g->name; g++) {
for (c = g->commands; c->name; c++) {
if (STREQ(c->name, cmdname))
return c;
}
}
return NULL;
}
const vshCmdGrp *
vshCmdGrpSearch(const char *grpname) vshCmdGrpSearch(const char *grpname)
{ {
const vshCmdGrp *g; const vshCmdGrp *g;
@ -629,7 +637,7 @@ vshCmdGrpSearch(const char *grpname)
return NULL; return NULL;
} }
bool static bool
vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp) vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp)
{ {
const vshCmdDef *cmd = NULL; const vshCmdDef *cmd = NULL;

4
tools/vsh.h
View File

@ -244,10 +244,6 @@ void vshOutputLogFile(vshControl *ctl, int log_level, const char *format,
G_GNUC_PRINTF(3, 0); G_GNUC_PRINTF(3, 0);
void vshCloseLogFile(vshControl *ctl); void vshCloseLogFile(vshControl *ctl);
const vshCmdDef *vshCmddefSearch(const char *cmdname);
const vshCmdGrp *vshCmdGrpSearch(const char *grpname);
bool vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp);
int vshCommandOptInt(vshControl *ctl, const vshCmd *cmd, int vshCommandOptInt(vshControl *ctl, const vshCmd *cmd,
const char *name, int *value) const char *name, int *value)
ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT;