From nobody Tue Sep 9 03:20:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1750167985; cv=none; d=zohomail.com; s=zohoarc; b=eVMttu6qu+zvYtwGMKl7MltjSjyDKQPUTIHbADEHspx4zsKbvrH5e4J6y1fYyDHdH+YFElTKngVEUY7nfehmqIsRX7oazv4apDHuyz2fE7aLr03KmfCBNHbbSmzewxPRP/z04G0bJurAbano9wmsrepCuJVXKwy9doD1OcVQJ/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750167985; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=9qsbb/OegeF7ujDnUnlNPU4bbO+ViGXfQjxjL6Y4UMk=; b=Sx7nEv52V2uRyMw80mNeMZQzEX4Pl4vEnMeKuru9S2PkI0xf0q4K68JVUONBQEW8XVhZkzz6shu7jthMxyAhV5KoersbkYeeqqAzkjGSI4l1xbYNuyS1j+al83cnzVYLeGWx0TC/IgEyT+Jc6uwfauQWxk7rSnP0DtMy2Vg7jxI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1750167985311633.2487937932793; Tue, 17 Jun 2025 06:46:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 60918E75; Tue, 17 Jun 2025 09:46:24 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C597410F6; Tue, 17 Jun 2025 09:44:30 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 085D6B98; Tue, 17 Jun 2025 09:44:25 -0400 (EDT) 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 E58C5BDB for ; Tue, 17 Jun 2025 09:44:11 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-104-TG30z4dNPgmuKrJ2Cy8HWQ-1; Tue, 17 Jun 2025 09:44:08 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C29719560BF for ; Tue, 17 Jun 2025 13:44:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.10]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9AA04180035C for ; Tue, 17 Jun 2025 13:44: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=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750167851; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=8+vSS/Q0v9bFCC4AkEtXIHTxVOFt+7OdHWGnMghDa9Y=; b=V7v9RI4SgA1H2nWXJ9iSJap0dYDmAerJYe6Lrjx1adi5r6yqrgDeXiUhkL9elxZigwJvHI l0VU17Qis/WJlBNBnq9sGSHz7/Wt7O0iEnUTEsGmnzWjBXsW4Criz+OsUn8Rdln6nmnzJF Uz6vXRVo2hR3swcZfhtYFBwK3EMntHo= X-MC-Unique: TG30z4dNPgmuKrJ2Cy8HWQ-1 X-Mimecast-MFC-AGG-ID: TG30z4dNPgmuKrJ2Cy8HWQ_1750167847 To: devel@lists.libvirt.org Subject: [PATCH 4/6] storage: parthelper: Use if/else instead of ternary operator Date: Tue, 17 Jun 2025 15:43:57 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: OAL_XzHT7wZkhgtjR-H3JKUTomw7aUvix54XPf_oTrU_1750167847 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SMW7PSRDYG4QRUH4CN7WAQEFJH7NXSJG X-Message-ID-Hash: SMW7PSRDYG4QRUH4CN7WAQEFJH7NXSJG X-MailFrom: pkrempa@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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1750167986161116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa --- src/storage/parthelper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 1169ebfb64..94aac34f7c 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -95,8 +95,11 @@ int main(int argc, char **argv) if (virFileResolveLink(path, &canonical_path) !=3D 0) return 2; - partsep =3D *canonical_path && - g_ascii_isdigit(canonical_path[strlen(canonical_path)-1]) ? "p= " : ""; + if (*canonical_path && + g_ascii_isdigit(canonical_path[strlen(canonical_path)-1])) + partsep =3D "p"; + else + partsep =3D ""; } if ((dev =3D ped_device_get(path)) =3D=3D NULL) { --=20 2.49.0