[PATCH] vsh: Move 'vshReadlineOptionsGenerator' out of '#if WITH_READLINE'
It's now also used in vshCompleteHelpCommand which is outside of the
conditionally compiled code.
Fixes: 80f70c74a7
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
Pushed under the build-fix rule.
tools/vsh.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/tools/vsh.c b/tools/vsh.c
index cf24586b25..9057310077 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2543,17 +2543,12 @@ vshTreePrint(vshControl *ctl, vshTreeLookup lookup, void *opaque,
return ret;
}
-#if WITH_READLINE
-
-/* -----------------
- * Readline stuff
- * -----------------
- */
/**
* vshReadlineCommandGenerator:
*
- * Generator function for command completion.
+ * Generator function for command completion. Used also for completing the
+ * '--command' option of the 'help' command.
*
* Returns a string list of all commands, or NULL on failure.
*/
@@ -2590,6 +2585,15 @@ vshReadlineCommandGenerator(void)
return g_steal_pointer(&ret);
}
+
+#if WITH_READLINE
+
+/* -----------------
+ * Readline stuff
+ * -----------------
+ */
+
+
static char **
vshReadlineOptionsGenerator(const vshCmdDef *cmd,
vshCmd *last)
--
2.31.1