From 7415e72e68be94bc7a971e16675e2ffb04741f2f Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 4 Feb 2021 13:46:12 +0100 Subject: [PATCH] vsh: Drop unused @text arg from readline generators After previous patches neither vshReadlineCommandGenerator() nor vshReadlineOptionsGenerator() use prefix that user wants to complete. The argument is marked as unused in both functions. Drop it then. Signed-off-by: Michal Privoznik Reviewed-by: Jonathon Jongsma --- tools/vsh.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 70f780087d..feddc9f13e 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2557,14 +2557,13 @@ vshTreePrint(vshControl *ctl, vshTreeLookup lookup, void *opaque, /** * vshReadlineCommandGenerator: - * @text: optional command prefix * * Generator function for command completion. * * Returns a string list of all commands, or NULL on failure. */ static char ** -vshReadlineCommandGenerator(const char *text G_GNUC_UNUSED) +vshReadlineCommandGenerator(void) { size_t grp_list_index = 0; const vshCmdGrp *grp; @@ -2597,8 +2596,7 @@ vshReadlineCommandGenerator(const char *text G_GNUC_UNUSED) } static char ** -vshReadlineOptionsGenerator(const char *text G_GNUC_UNUSED, - const vshCmdDef *cmd, +vshReadlineOptionsGenerator(const vshCmdDef *cmd, vshCmd *last) { size_t list_index = 0; @@ -2742,9 +2740,9 @@ vshReadlineParse(const char *text, int state) opt = vshReadlineCommandFindOpt(partial); if (!cmd) { - list = vshReadlineCommandGenerator(text); + list = vshReadlineCommandGenerator(); } else if (!opt || opt->type == VSH_OT_BOOL) { - list = vshReadlineOptionsGenerator(text, cmd, partial); + list = vshReadlineOptionsGenerator(cmd, partial); } else if (opt && opt->completer) { list = opt->completer(autoCompleteOpaque, partial,