From nobody Thu May 2 03:45:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631869332; cv=none; d=zohomail.com; s=zohoarc; b=KVml4Et9WwIxXj/9WdZLERSJpW/+a0+ytoe/OpZ2h+Lh9MwtNty2/jjayqCoOLxCFM5hIW+6L5cSDnmNYDfcZ2fX7SHCjUr1ydipUdp5OuVdcy8RJaHsa3enM5LlM+QyNQeDkmyCWtttvJEhVmww4VpFVt2Ql6lFVqpSJ6U2ZcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631869332; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=JI1EalwUdY2ASfE7jlFYoeOThBBNguD2boXRavotxVc=; b=d1Te7KvMPcwknKs3Ypd5R5k7HQHcBN5qz/ZC06Ctu/BIhOLOn29wtln/nq0kAVIZ2p3S/Hz+iiwUZTGul1rJTlCXsiKMjvQBaDC1QP7hGPKOWnid0DU9ikUcXw0LnNsOAbwUjU847qPBpaECyAcL2gjRag8qjEi2xj1131iyWyc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16318693325512.980665858337602; Fri, 17 Sep 2021 02:02:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-152-Oaq18KxyOIqNapVUMmH-UA-1; Fri, 17 Sep 2021 05:02:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39C861023F50; Fri, 17 Sep 2021 09:02:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72B8A60BD8; Fri, 17 Sep 2021 09:02:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BAAAC180142F; Fri, 17 Sep 2021 09:01:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18H91u7V021274 for ; Fri, 17 Sep 2021 05:01:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE8BA60C9F; Fri, 17 Sep 2021 09:01:56 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20AEA60BF1 for ; Fri, 17 Sep 2021 09:01:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631869331; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JI1EalwUdY2ASfE7jlFYoeOThBBNguD2boXRavotxVc=; b=Xt+3DRaLU7F/Rm1uqRfd8lCmE5xCWofXmZ1DdQUqoX5NQH2en7X3rhZuHiGstR1i+M0e+m Tzpc4//neHgmLPQKPiriZjGZvMG4kKwr0SJXVJ/wQu/13i+pLETaFGWIIMvrp0BuaHJxJj 2a6NKrgEU4lzo6FX1MLynlneYmzcXig= X-MC-Unique: Oaq18KxyOIqNapVUMmH-UA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] vsh: Move 'vshReadlineOptionsGenerator' out of '#if WITH_READLINE' Date: Fri, 17 Sep 2021 11:01:54 +0200 Message-Id: <9d26af5e5b431eab364a0b36152cc51897ef641c.1631869294.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631869335082100001 Content-Type: text/plain; charset="utf-8" It's now also used in vshCompleteHelpCommand which is outside of the conditionally compiled code. Fixes: 80f70c74a7 Signed-off-by: Peter Krempa --- 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) --=20 2.31.1