From nobody Tue Mar 24 01:20:59 2026 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=1773763870; cv=none; d=zohomail.com; s=zohoarc; b=enRLWCIWfXUIvk0HX6aIO3+Xf1dA6VpACYcb0GOP6DJoQrbbK2YlFzb9oGeL0eXMd/eJnifSONikX8Ps9xkEbTA5/6o+5j44gDjwGPSvwqRdqJZ9GQMWfKNEjyq1VbR4E6Fzpgwk3m+P1Ia+QeQoEcTuWxMVnbHVuNemyr4F+g0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773763870; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner: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=9Kms62y1XJzC9b28XOoohiLiM1wz/jOykAuWBbnkZv4=; b=DGnvgicH2r1aygwRUybqihKXwvOWBCF9q0av6Ek79ck11aMy3Hrl/EIDDkzTEwEVYbt5YjJlvJe+qpVD6f519Ys6beFihTb8awfnXxkPqczjJtGYqPkzxcnkz/oY1TlZiSQK7HT92kZFW+Li1Vubvxhdx0DSrbkDMTIR2IWvrDY= 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 1773763869957794.1015192218122; Tue, 17 Mar 2026 09:11:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3622B418FF; Tue, 17 Mar 2026 12:11:09 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 808C141949; Tue, 17 Mar 2026 12:10:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 789AB3F8EE; Tue, 17 Mar 2026 12:10:12 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F17FC3F896 for ; Tue, 17 Mar 2026 12:10:11 -0400 (EDT) Received: from mx-prod-mc-05.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-554-yiKUzqkCMrKZm_FgZ0oUlg-1; Tue, 17 Mar 2026 12:10:10 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 58EA619560A2 for ; Tue, 17 Mar 2026 16:10:09 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B49D21955F19 for ; Tue, 17 Mar 2026 16:10:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773763811; 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=9Kms62y1XJzC9b28XOoohiLiM1wz/jOykAuWBbnkZv4=; b=bMWeK6nZ27pYVdDg3Touo2olu6ktPe5gRuB4PhMmVIvth1BuvygFQxWqn89/qvgkcJ0mUj GtB/UW8bMx+ownmpDYNWlk2c13t889CNR4kmwiCim9UgC5eRmj9LZJqGzLOftZK1oX3Ghi CITTMArSLAc03nX03cO1fJ03pqLRKRI= X-MC-Unique: yiKUzqkCMrKZm_FgZ0oUlg-1 X-Mimecast-MFC-AGG-ID: yiKUzqkCMrKZm_FgZ0oUlg_1773763809 To: devel@lists.libvirt.org Subject: [PATCH 1/3] src: Drop NULL check before calling virBufferEscapeString() Date: Tue, 17 Mar 2026 17:10:03 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: AAo5ypRyxcKIH62XAgtqT3iBSCJM52oygDR_j1kDiwY_1773763809 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JWHFUKORAPRRVVRBFYJRCYRU4O3XMP5U X-Message-ID-Hash: JWHFUKORAPRRVVRBFYJRCYRU4O3XMP5U X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1773763876335154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik There's no need to check if any of the three arguments passed to virBufferEscapeString() is NULL as the function does so itself. Well, in a few places we're comparing the last argument against NULL. Drop the comparison then. Generated using the following spatch: @@ expression X, Y, E; @@ - if (E) virBufferEscapeString(X, Y, E); + virBufferEscapeString(X, Y, E); @@ expression X, Y, E; @@ - if (E) { virBufferEscapeString(X, Y, E); - } Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 17 +++++------------ src/conf/network_conf.c | 13 ++++--------- src/conf/node_device_conf.c | 4 +--- src/qemu/qemu_domain.c | 16 ++++++++-------- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 03a05366e1..b1a73afef2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -24215,11 +24215,8 @@ virDomainDiskDefFormatIotune(virBuffer *buf, virBufferAsprintf(&childBuf, "%llu\= n", disk->blkdeviotune.size_iops_sec); } - - if (disk->blkdeviotune.group_name) { - virBufferEscapeString(&childBuf, "%s\n", - disk->blkdeviotune.group_name); - } + virBufferEscapeString(&childBuf, "%s\n", + disk->blkdeviotune.group_name); =20 FORMAT_IOTUNE(total_bytes_sec_max_length); FORMAT_IOTUNE(read_bytes_sec_max_length); @@ -27491,9 +27488,7 @@ virDomainGraphicsAuthDefFormatAttr(virBuffer *buf, if (!def->passwd) return; =20 - if (def->username) - virBufferEscapeString(buf, " username=3D'%s'", - def->username); + virBufferEscapeString(buf, " username=3D'%s'", def->username); =20 if (flags & VIR_DOMAIN_DEF_FORMAT_SECURE) virBufferEscapeString(buf, " passwd=3D'%s'", @@ -27623,8 +27618,7 @@ virDomainGraphicsListenDefFormatAddr(virBuffer *buf, VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) return; =20 - if (glisten->address) - virBufferEscapeString(buf, " listen=3D'%s'", glisten->address); + virBufferEscapeString(buf, " listen=3D'%s'", glisten->address); } =20 static void @@ -27637,8 +27631,7 @@ virDomainGraphicsDefFormatGL(virBuffer *buf, if (gl !=3D VIR_TRISTATE_BOOL_ABSENT) virBufferAsprintf(&attrBuf, " enable=3D'%s'", virTristateBoolTypeT= oString(gl)); =20 - if (rendernode) - virBufferEscapeString(&attrBuf, " rendernode=3D'%s'", rendernode); + virBufferEscapeString(&attrBuf, " rendernode=3D'%s'", rendernode); =20 virXMLFormatElement(buf, "gl", &attrBuf, NULL); } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index fe44fd28c3..26887342e4 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2000,10 +2000,8 @@ virNetworkDNSDefFormat(virBuffer *buf, for (i =3D 0; i < def->nfwds; i++) { =20 virBufferAddLit(buf, "forwarders[i].domain) { - virBufferEscapeString(buf, " domain=3D'%s'", - def->forwarders[i].domain); - } + virBufferEscapeString(buf, " domain=3D'%s'", + def->forwarders[i].domain); if (VIR_SOCKET_ADDR_VALID(&def->forwarders[i].addr)) { g_autofree char *addr =3D virSocketAddrFormat(&def->forwarders= [i].addr); int port =3D virSocketAddrGetPort(&def->forwarders[i].addr); @@ -2093,11 +2091,8 @@ virNetworkIPDefFormat(virBuffer *buf, =20 virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - - if (def->tftproot) { - virBufferEscapeString(buf, "\n", - def->tftproot); - } + virBufferEscapeString(buf, "\n", + def->tftproot); if ((def->nranges || def->nhosts)) { size_t i; virBufferAddLit(buf, "\n"); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index ed0d340aa2..09f9e218a4 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -432,9 +432,7 @@ virNodeDeviceCapUSBDevDefFormat(virBuffer *buf, virBufferAsprintf(buf, "%d\n", data->usb_dev.bus); virBufferAsprintf(buf, "%d\n", data->usb_dev.device); - if (data->usb_dev.port) - virBufferEscapeString(buf, "%s\n", - data->usb_dev.port); + virBufferEscapeString(buf, "%s\n", data->usb_dev.port); virBufferAsprintf(buf, "usb_dev.product); if (data->usb_dev.product_name) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ccbfc8bac7..6fdca4be09 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2335,18 +2335,18 @@ qemuDomainDiskPrivateFormat(virDomainDiskDef *disk, if (priv->nodeCopyOnRead || disk->nthrottlefilters > 0) { virBufferAddLit(buf, "\n"); virBufferAdjustIndent(buf, 2); - if (priv->nodeCopyOnRead) - virBufferEscapeString(buf, "\n", - priv->nodeCopyOnRead); + virBufferEscapeString(buf, + "= \n", + priv->nodeCopyOnRead); if (disk->nthrottlefilters > 0) { for (i =3D 0; i < disk->nthrottlefilters; i++) { =20 - if (disk->throttlefilters[i]->nodename) - virBufferEscapeString(buf, "throttlefilters[i]->nodena= me); + virBufferEscapeString(buf, + "throttlefilters[i]->nodename); =20 - if (disk->throttlefilters[i]->group_name) - virBufferEscapeString(buf, "group=3D'%s'/>\n", disk->t= hrottlefilters[i]->group_name); + virBufferEscapeString(buf, "group=3D'%s'/>\n", + disk->throttlefilters[i]->group_name= ); } } virBufferAdjustIndent(buf, -2); --=20 2.52.0