[PATCH 09/13] vsh: Unexport command lookup helpers 'vshCmddefSearch', 'vshCmdGrpSearch', 'vshCmdGrpHelp'
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(a)redhat.com>
---
tools/vsh.c | 44 ++++++++++++++++++++++++++------------------
tools/vsh.h | 4 ----
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/tools/vsh.c b/tools/vsh.c
index 1d8aecc41b..256ba55a83 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -239,6 +239,30 @@ vshReportError(vshControl *ctl)
*/
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.
* None of the errors are to be marked as translatable. */
static int
@@ -600,23 +624,7 @@ vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint64_t
opts_required,
return -1;
}
-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;
-}
-
-const vshCmdGrp *
+static const vshCmdGrp *
vshCmdGrpSearch(const char *grpname)
{
const vshCmdGrp *g;
@@ -629,7 +637,7 @@ vshCmdGrpSearch(const char *grpname)
return NULL;
}
-bool
+static bool
vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp)
{
const vshCmdDef *cmd = NULL;
diff --git a/tools/vsh.h b/tools/vsh.h
index a9c5b674bb..20eaf10022 100644
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -244,10 +244,6 @@ void vshOutputLogFile(vshControl *ctl, int log_level, const char
*format,
G_GNUC_PRINTF(3, 0);
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,
const char *name, int *value)
ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT;
--
2.44.0