From nobody Mon Sep 16 19:23:58 2024 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=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 1718620608478238.85652329997356; Mon, 17 Jun 2024 03:36:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1C97E12D4; Mon, 17 Jun 2024 06:36:47 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CAC9012BA; Mon, 17 Jun 2024 06:36:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1D27B1295; Mon, 17 Jun 2024 06:36:07 -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 38D251289 for ; Mon, 17 Jun 2024 06:36:06 -0400 (EDT) Received: from mx-prod-mc-02.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-264-ApDLyr73OWya3eczmzi43g-1; Mon, 17 Jun 2024 06:36:04 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 880B81956095 for ; Mon, 17 Jun 2024 10:36:03 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A82C61956054 for ; Mon, 17 Jun 2024 10:36:02 +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=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718620565; 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; bh=g3m9dHTZI05NZvxWv22jh9YQhno/VAQMXt9U+MxpQBg=; b=UIiZg5/tYWBcp7mFrc7Zim+YTpIJ9uxhkhNKcsq0dEk2/rDkyxnH9E940kC4AKKyu7+kSl jBkleOWwVfxjtb9noFGiyxuciFLYZQ6tdHwENhzKkvyuf4H4yhgdcfZ2M1cN04RbZV1sij c3b6Bwr6K4F57ax/3bN6MMEFUHf1nmU= X-MC-Unique: ApDLyr73OWya3eczmzi43g-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH] conf: Drop needless NULL checks guarding virBufferEscapeString() Date: Mon, 17 Jun 2024 12:36:00 +0200 Message-ID: <5e2f437cb885e135cfe659dc84123af1847c38da.1718620560.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LA22VDTRVJN6L57L65UMFD74YH5TEK7L X-Message-ID-Hash: LA22VDTRVJN6L57L65UMFD74YH5TEK7L X-MailFrom: mprivozn@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1718620609290100001 Content-Type: text/plain; charset="utf-8"; x-default="true" There's no need to guard virBufferEscapeString() with a call to NULL as the very first thing the function does is check all three arguments for NULL. This patch was generated using the following spatch: @@ expression X, Y, E; @@ - if (E) virBufferEscapeString(X, Y, E); Signed-off-by: Michal Privoznik Reviewed-by: Jonathon Jongsma --- src/conf/capabilities.c | 6 ++-- src/conf/domain_conf.c | 57 +++++++++++------------------- src/conf/network_conf.c | 6 ++-- src/conf/node_device_conf.c | 57 ++++++++++++------------------ src/conf/snapshot_conf.c | 5 ++- src/conf/storage_encryption_conf.c | 9 ++--- src/conf/storage_source_conf.c | 3 +- src/conf/virnwfilterbindingdef.c | 3 +- 8 files changed, 55 insertions(+), 91 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index fe5e42c167..74e6293766 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -693,10 +693,8 @@ virCapabilitiesDomainDataLookupInternal(virCaps *caps, if (domaintype > VIR_DOMAIN_VIRT_NONE) virBufferAsprintf(&buf, "domaintype=3D%s ", virDomainVirtTypeToString(domaintype)); - if (emulator) - virBufferEscapeString(&buf, "emulator=3D%s ", emulator); - if (machinetype) - virBufferEscapeString(&buf, "machine=3D%s ", machinetype); + virBufferEscapeString(&buf, "emulator=3D%s ", emulator); + virBufferEscapeString(&buf, "machine=3D%s ", machinetype); if (virBufferCurrentContent(&buf) && !virBufferCurrentContent(&buf)[0]) virBufferAsprintf(&buf, "%s", _("any configuration")); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fde594f811..2f1e99865b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5394,8 +5394,7 @@ virDomainDeviceInfoFormat(virBuffer *buf, if (rombar) virBufferAsprintf(buf, " bar=3D'%s'", rombar); } - if (info->romfile) - virBufferEscapeString(buf, " file=3D'%s'", info->romfile); + virBufferEscapeString(buf, " file=3D'%s'", info->romfile); virBufferAddLit(buf, "/>\n"); } =20 @@ -22175,8 +22174,7 @@ virSecurityDeviceLabelDefFormat(virBuffer *buf, =20 virBufferAddLit(buf, "model) - virBufferEscapeString(buf, " model=3D'%s'", def->model); + virBufferEscapeString(buf, " model=3D'%s'", def->model); =20 if (def->labelskip) virBufferAddLit(buf, " labelskip=3D'yes'"); @@ -22371,8 +22369,7 @@ virDomainDiskSourceFormatNetwork(virBuffer *attrBuf, virBufferAsprintf(childBuf, "\n", src->= timeout); =20 if (src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_SSH) { - if (src->ssh_known_hosts_file) - virBufferEscapeString(childBuf, "\n",= src->ssh_known_hosts_file); + virBufferEscapeString(childBuf, "\n", src= ->ssh_known_hosts_file); if (src->ssh_keyfile || src->ssh_agent) { virBufferAddLit(childBuf, "idx); =20 - if (model) - virBufferEscapeString(&attrBuf, " model=3D'%s'", model); + virBufferEscapeString(&attrBuf, " model=3D'%s'", model); =20 switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: @@ -24581,8 +24577,7 @@ virDomainChrTargetDefFormat(virBuffer *buf, =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (def->target.name) - virBufferEscapeString(buf, " name=3D'%s'", def->target.nam= e); + virBufferEscapeString(buf, " name=3D'%s'", def->target.name); =20 if (def->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_= VIRTIO && def->state !=3D VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT && @@ -26004,9 +25999,8 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; } =20 - if (def->data.vnc.keymap) - virBufferEscapeString(buf, " keymap=3D'%s'", - def->data.vnc.keymap); + virBufferEscapeString(buf, " keymap=3D'%s'", + def->data.vnc.keymap); =20 if (def->data.vnc.sharePolicy) virBufferAsprintf(buf, " sharePolicy=3D'%s'", @@ -26021,13 +26015,11 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - if (def->data.sdl.display) - virBufferEscapeString(buf, " display=3D'%s'", - def->data.sdl.display); + virBufferEscapeString(buf, " display=3D'%s'", + def->data.sdl.display); =20 - if (def->data.sdl.xauth) - virBufferEscapeString(buf, " xauth=3D'%s'", - def->data.sdl.xauth); + virBufferEscapeString(buf, " xauth=3D'%s'", + def->data.sdl.xauth); if (def->data.sdl.fullscreen) virBufferAddLit(buf, " fullscreen=3D'yes'"); =20 @@ -26066,9 +26058,8 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - if (def->data.desktop.display) - virBufferEscapeString(buf, " display=3D'%s'", - def->data.desktop.display); + virBufferEscapeString(buf, " display=3D'%s'", + def->data.desktop.display); =20 if (def->data.desktop.fullscreen) virBufferAddLit(buf, " fullscreen=3D'yes'"); @@ -26121,9 +26112,8 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; } =20 - if (def->data.spice.keymap) - virBufferEscapeString(buf, " keymap=3D'%s'", - def->data.spice.keymap); + virBufferEscapeString(buf, " keymap=3D'%s'", + def->data.spice.keymap); =20 if (def->data.spice.defaultMode !=3D VIR_DOMAIN_GRAPHICS_SPICE_CHA= NNEL_MODE_ANY) virBufferAsprintf(buf, " defaultMode=3D'%s'", @@ -26503,11 +26493,9 @@ virDomainResourceDefFormat(virBuffer *buf, if (!def) return; =20 - if (def->partition) - virBufferEscapeString(&childBuf, "%s\n", de= f->partition); + virBufferEscapeString(&childBuf, "%s\n", def->p= artition); =20 - if (def->appid) - virBufferEscapeString(&childBuf, "\n",= def->appid); + virBufferEscapeString(&childBuf, "\n", def= ->appid); =20 virXMLFormatElement(buf, "resource", NULL, &childBuf); } @@ -26680,11 +26668,9 @@ virDomainSecDefFormat(virBuffer *buf, virDomainSec= Def *sec) virBufferAsprintf(&childBuf, "%d\n", sev->reduced_phys_bits); virBufferAsprintf(&childBuf, "0x%04x\n", sev->pol= icy); - if (sev->dh_cert) - virBufferEscapeString(&childBuf, "%s\n", sev-= >dh_cert); + virBufferEscapeString(&childBuf, "%s\n", sev->dh_= cert); =20 - if (sev->session) - virBufferEscapeString(&childBuf, "%s\n", se= v->session); + virBufferEscapeString(&childBuf, "%s\n", sev->s= ession); =20 break; } @@ -27910,9 +27896,8 @@ virDomainDefFormatInternalSetRootName(virDomainDef = *def, for (i =3D 0; def->os.initenv && def->os.initenv[i]; i++) virBufferAsprintf(buf, "%s\n", def->os.initenv[i]->name, def->os.initenv[i]->va= lue); - if (def->os.initdir) - virBufferEscapeString(buf, "%s\n", - def->os.initdir); + virBufferEscapeString(buf, "%s\n", + def->os.initdir); if (def->os.inituser) virBufferAsprintf(buf, "%s\n", def->os.initus= er); if (def->os.initgroup) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index cc92ed0b03..f5ccf4bd12 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2004,10 +2004,8 @@ virNetworkDNSDefFormat(virBuffer *buf, def->srvs[i].service); virBufferEscapeString(buf, "protocol=3D'%s'", def->srvs[i].pro= tocol); =20 - if (def->srvs[i].domain) - virBufferEscapeString(buf, " domain=3D'%s'", def->srvs[i].= domain); - if (def->srvs[i].target) - virBufferEscapeString(buf, " target=3D'%s'", def->srvs[i].= target); + virBufferEscapeString(buf, " domain=3D'%s'", def->srvs[i].doma= in); + virBufferEscapeString(buf, " target=3D'%s'", def->srvs[i].targ= et); if (def->srvs[i].port) virBufferAsprintf(buf, " port=3D'%d'", def->srvs[i].port); if (def->srvs[i].priority) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index fe6d9a36b2..d2b578178b 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -176,20 +176,16 @@ virNodeDeviceCapSystemDefFormat(virBuffer *buf, { char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - if (data->system.product_name) - virBufferEscapeString(buf, "%s\n", - data->system.product_name); + virBufferEscapeString(buf, "%s\n", + data->system.product_name); virBufferAddLit(buf, "\n"); virBufferAdjustIndent(buf, 2); - if (data->system.hardware.vendor_name) - virBufferEscapeString(buf, "%s\n", - data->system.hardware.vendor_name); - if (data->system.hardware.version) - virBufferEscapeString(buf, "%s\n", - data->system.hardware.version); - if (data->system.hardware.serial) - virBufferEscapeString(buf, "%s\n", - data->system.hardware.serial); + virBufferEscapeString(buf, "%s\n", + data->system.hardware.vendor_name); + virBufferEscapeString(buf, "%s\n", + data->system.hardware.version); + virBufferEscapeString(buf, "%s\n", + data->system.hardware.serial); virUUIDFormat(data->system.hardware.uuid, uuidstr); virBufferAsprintf(buf, "%s\n", uuidstr); virBufferAdjustIndent(buf, -2); @@ -197,15 +193,12 @@ virNodeDeviceCapSystemDefFormat(virBuffer *buf, =20 virBufferAddLit(buf, "\n"); virBufferAdjustIndent(buf, 2); - if (data->system.firmware.vendor_name) - virBufferEscapeString(buf, "%s\n", - data->system.firmware.vendor_name); - if (data->system.firmware.version) - virBufferEscapeString(buf, "%s\n", - data->system.firmware.version); - if (data->system.firmware.release_date) - virBufferEscapeString(buf, "%s\n", - data->system.firmware.release_date); + virBufferEscapeString(buf, "%s\n", + data->system.firmware.vendor_name); + virBufferEscapeString(buf, "%s\n", + data->system.firmware.version); + virBufferEscapeString(buf, "%s\n", + data->system.firmware.release_date); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); } @@ -225,9 +218,8 @@ virNodeDeviceCapMdevTypesFormat(virBuffer *buf, virMediatedDeviceType *type =3D mdev_types[i]; virBufferEscapeString(buf, "\n", type->id); virBufferAdjustIndent(buf, 2); - if (type->name) - virBufferEscapeString(buf, "%s\n", - type->name); + virBufferEscapeString(buf, "%s\n", + type->name); virBufferEscapeString(buf, "%s\n", type->device_api); virBufferAsprintf(buf, @@ -454,10 +446,9 @@ virNodeDeviceCapUSBInterfaceDefFormat(virBuffer *buf, data->usb_if.subclass); virBufferAsprintf(buf, "%d\n", data->usb_if.protocol); - if (data->usb_if.description) - virBufferEscapeString(buf, - "%s\n", - data->usb_if.description); + virBufferEscapeString(buf, + "%s\n", + data->usb_if.description); } =20 =20 @@ -469,9 +460,8 @@ virNodeDeviceCapNetDefFormat(virBuffer *buf, =20 virBufferEscapeString(buf, "%s\n", data->net.ifname); - if (data->net.address) - virBufferEscapeString(buf, "
%s
\n", - data->net.address); + virBufferEscapeString(buf, "
%s
\n", + data->net.address); virInterfaceLinkFormat(buf, &data->net.lnk); if (data->net.features) { for (i =3D 0; i < VIR_NET_DEV_FEAT_LAST; i++) { @@ -533,9 +523,8 @@ virNodeDeviceCapSCSIDefFormat(virBuffer *buf, virBufferAsprintf(buf, "%d\n", data->scsi.target); virBufferAsprintf(buf, "%d\n", data->scsi.lun); - if (data->scsi.type) - virBufferEscapeString(buf, "%s\n", - data->scsi.type); + virBufferEscapeString(buf, "%s\n", + data->scsi.type); } =20 =20 diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index d7fcded302..039ed77b84 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -819,9 +819,8 @@ virDomainSnapshotDefFormatInternal(virBuffer *buf, virBufferAdjustIndent(buf, 2); =20 virBufferEscapeString(buf, "%s\n", def->parent.name); - if (def->parent.description) - virBufferEscapeString(buf, "%s\n", - def->parent.description); + virBufferEscapeString(buf, "%s\n", + def->parent.description); if (def->state) virBufferAsprintf(buf, "%s\n", virDomainSnapshotStateTypeToString(def->state)); diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encrypti= on_conf.c index 1849df5c6c..b86001ec50 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -317,16 +317,13 @@ virStorageEncryptionInfoDefFormat(virBuffer *buf, { virBufferEscapeString(buf, "cipher_name); virBufferAsprintf(buf, " size=3D'%u'", enc->cipher_size); - if (enc->cipher_mode) - virBufferEscapeString(buf, " mode=3D'%s'", enc->cipher_mode); - if (enc->cipher_hash) - virBufferEscapeString(buf, " hash=3D'%s'", enc->cipher_hash); + virBufferEscapeString(buf, " mode=3D'%s'", enc->cipher_mode); + virBufferEscapeString(buf, " hash=3D'%s'", enc->cipher_hash); virBufferAddLit(buf, "/>\n"); =20 if (enc->ivgen_name) { virBufferEscapeString(buf, "ivgen_name); - if (enc->ivgen_hash) - virBufferEscapeString(buf, " hash=3D'%s'", enc->ivgen_hash); + virBufferEscapeString(buf, " hash=3D'%s'", enc->ivgen_hash); virBufferAddLit(buf, "/>\n"); } } diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 959ec5ed40..908bc5fab2 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -1347,8 +1347,7 @@ int virStorageSourcePrivateDataFormatRelPath(virStorageSource *src, virBuffer *buf) { - if (src->relPath) - virBufferEscapeString(buf, "%s\n", src->relPath= ); + virBufferEscapeString(buf, "%s\n", src->relPath); =20 return 0; } diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 423ed7a392..fe45c84347 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -203,8 +203,7 @@ virNWFilterBindingDefFormatBuf(virBuffer *buf, virBufferAddLit(buf, "\n"); =20 virBufferEscapeString(buf, "\n", def->portdevnam= e); - if (def->linkdevname) - virBufferEscapeString(buf, "\n", def->linkde= vname); + virBufferEscapeString(buf, "\n", def->linkdevnam= e); =20 virMacAddrFormat(&def->mac, mac); virBufferAsprintf(buf, "\n", mac); --=20 2.44.2