From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 17 Sep 2021 08:58:28 +0000 (+0200)
Subject: vsh: Move 'vshReadlineOptionsGenerator' out of '#if WITH_READLINE'
X-Git-Tag: v7.8.0-rc1~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d26af5e5b431eab364a0b36152cc51897ef641c;p=thirdparty%2Flibvirt.git

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@redhat.com>
---

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)