From nobody Mon Feb 9 10:28:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1554820085; cv=none; d=zoho.com; s=zohoarc; b=DsH6EYY8jGY216yPeMoqjicjlArLYFuQ9DBmhbl7/erF3v8csgKdAMV8wMm41BxvScYmKQnL1+MEpZ56PC+eo22N8Vh+8VSpHrC1Q5nCDOHGes+gWSxruIyXTFefd7/Kql1YX6MR/3Crnpb2CPo8ty+5pw04nHbABPFTw5Eqh3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554820085; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=H/EDLGLjRT962IhwGG1+VWwy6tbNq2ohl9Aiqn4rhrg=; b=jPLzYXvsEcWEOCnJgRhxbfCemx1bEQol+9/0TU6oh2IB0ebsY/ALC379Zx/kFo9GTgup9M72rpicVC4uNkrZ7gJt2X1ez6pIIBk3gJTBgtQCVUzIfeJvo1371QXZ3FVt/JTZeD1qkAYkSjF2cyf3O0wWE+6e1/yNCTvPTEMrP/c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554820085976817.1339303950834; Tue, 9 Apr 2019 07:28:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5CE263002E19; Tue, 9 Apr 2019 14:28:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3014817F60; Tue, 9 Apr 2019 14:28: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 E308A3FA48; Tue, 9 Apr 2019 14:28:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x39ERt03024232 for ; Tue, 9 Apr 2019 10:27:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id B1ABE21EFC; Tue, 9 Apr 2019 14:27:55 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 383F72639F for ; Tue, 9 Apr 2019 14:27:55 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 9 Apr 2019 16:27:44 +0200 Message-Id: <20190409142750.32034-2-abologna@redhat.com> In-Reply-To: <20190409142750.32034-1-abologna@redhat.com> References: <20190409142750.32034-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/7] tools: vsh: Drop obsolete readline compatibility code 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 09 Apr 2019 14:28:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This code is needed to use readline older than 4.1, but all our target platforms ship with at least 6.0 these days so we can safely get rid of it. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- tools/vsh.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 65b96f87d5..f2486498c9 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2945,32 +2945,15 @@ vshReadlineInit(vshControl *ctl) /* Opaque data for autocomplete callbacks. */ autoCompleteOpaque =3D ctl; =20 - /* Allow conditional parsing of the ~/.inputrc file. - * Work around ancient readline 4.1 (hello Mac OS X), - * which declared it as 'char *' instead of 'const char *'. - */ -# if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 rl_readline_name =3D ctl->name; -# else - rl_readline_name =3D (char *) ctl->name; -# endif =20 /* Tell the completer that we want a crack first. */ rl_attempted_completion_function =3D vshReadlineCompletion; =20 -# if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 rl_basic_word_break_characters =3D break_characters; -# else - rl_basic_word_break_characters =3D (char *) break_characters; -# endif =20 -# if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 rl_completer_quote_characters =3D quote_characters; rl_char_is_quoted_p =3D vshReadlineCharIsQuoted; -# else - rl_completer_quote_characters =3D (char *) quote_characters; - rl_char_is_quoted_p =3D (Function *) vshReadlineCharIsQuoted; -# endif =20 if (virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix) < 0) goto cleanup; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list