From nobody Sat Feb 7 08:13:53 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1709135884451632.998978055809; Wed, 28 Feb 2024 07:58:04 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5D3C91E21; Wed, 28 Feb 2024 10:58:03 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2810C1EA3; Wed, 28 Feb 2024 10:52:45 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4A3A51CFC; Wed, 28 Feb 2024 10:52:33 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CA03F1B0D for ; Wed, 28 Feb 2024 10:52:10 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-132-PbLkt6aMPU64KcvRmqNVFw-1; Wed, 28 Feb 2024 10:52:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DA276881D39 for ; Wed, 28 Feb 2024 15:52:06 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.226.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4017A400D784 for ; Wed, 28 Feb 2024 15:52:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: PbLkt6aMPU64KcvRmqNVFw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 2/3] virsh: remove trailing whitespace even when editing the description Date: Wed, 28 Feb 2024 16:51:33 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: HTSKMOCGSMQQI3454HIEMG7RRR5I7B27 X-Message-ID-Hash: HTSKMOCGSMQQI3454HIEMG7RRR5I7B27 X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1709135886386100001 When editing the title of a domain or network via the `desc` or `net-desc` commands, we strip the final newline that is added by some editors. Do the same when editing the description as well. Signed-off-by: J=C3=A1n Tomko --- tools/virsh-domain.c | 5 ++--- tools/virsh-network.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e69d14a6aa..7a87da1cbb 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8525,10 +8525,9 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) return false; =20 /* strip a possible newline at the end of file; some - * editors enforce a newline, this makes editing the title + * editors enforce a newline, this makes editing * more convenient */ - if (title && - (tmpstr =3D strrchr(desc_edited, '\n')) && + if ((tmpstr =3D strrchr(desc_edited, '\n')) && *(tmpstr+1) =3D=3D '\0') *tmpstr =3D '\0'; =20 diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 68c7543863..c676fc603c 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -481,8 +481,7 @@ cmdNetworkDesc(vshControl *ctl, const vshCmd *cmd) /* strip a possible newline at the end of file; some * editors enforce a newline, this makes editing the title * more convenient */ - if (title && - (tmpstr =3D strrchr(desc_edited, '\n')) && + if ((tmpstr =3D strrchr(desc_edited, '\n')) && *(tmpstr+1) =3D=3D '\0') *tmpstr =3D '\0'; =20 --=20 2.43.2 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org