From nobody Fri May 3 11:17:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1658403092; cv=none; d=zohomail.com; s=zohoarc; b=Hkiib0wzpWWhlQy7+ypUKrwbnt/qvDLZqaqsvQoNhH9OMVGvD3iBaHnrAAaZsKkujOuvEGC6XHJo1ByptEIRtFWefMzQ1C5KpnYHWPfuInNn6+9HZ5V8BJ1WV34yGFrnFdi0g/qaYP75BqhQrARQiAGudD/js04z+6XpU6VQ1uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658403092; 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; bh=eMM8LeeeVL9+9Z/IAGj9IzDmZR/5ls36ZzGoVZA0xSY=; b=SBNrj5N8Z7QDD9Z+h+NgAicUpkqsDYe9TB8Bgo4nQPlv0VEp5hSNMEIZRLW59JxHD4uaKTzMvdZXmrzS7SprK7QOJiYiOzaHUf+MCpuMo6ZJ7ll75D3ViKTjGb1WvjK7Kmp/We0rmi4I3M/3dxUghLTutfSpSzG6hFA5NLBiCts= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658403092434775.0447019150898; Thu, 21 Jul 2022 04:31:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-625-eHG0nQg8O9qOZy11uS8UqA-1; Thu, 21 Jul 2022 07:31:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 65F853C11076; Thu, 21 Jul 2022 11:31:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51CF21121314; Thu, 21 Jul 2022 11:31:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8B20D1947BBC; Thu, 21 Jul 2022 11:31:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 440841947040 for ; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1A97540D0168; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA58240D0160 for ; Thu, 21 Jul 2022 11:31:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658403090; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=eMM8LeeeVL9+9Z/IAGj9IzDmZR/5ls36ZzGoVZA0xSY=; b=MWIpBcxksK3dFX6MIJgLEbjnslJ7lHkTSHk9sXl5hEC3q5hgb/+huiQJrR2sCh0b2g0XmP jLoCPxcID1MiCndZWfRnjrrJmpDCP7D02n7JFqX2xO5bsXSv/X37zVey8lng2RYkbBtmK+ sRArneiiD8utXQO4SJ4gpMua411WKbw= X-MC-Unique: eHG0nQg8O9qOZy11uS8UqA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 1/2] domain_conf: remove else after return / goto Date: Thu, 21 Jul 2022 13:30:44 +0200 Message-Id: <04882dfcfade1299a03da8e602fb3d2fc951b8ac.1658402859.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658403094259100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The else branches are redundant because the execution will never reach them if the conditions in the previous 'if' branches are true. I think this looks cleaner and is more readable, because having 'else' branch indicates that no return / break / goto is in the previous branch and the function can reach it. Signed-off-by: Kristina Hanicova Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 26a241db38..41d23cfe2a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4084,8 +4084,8 @@ virDomainObjGetPersistentDef(virDomainXMLOption *xmlo= pt, =20 if (domain->newDef) return domain->newDef; - else - return domain->def; + + return domain->def; } =20 =20 @@ -4223,8 +4223,8 @@ virDomainObjGetOneDefState(virDomainObj *vm, =20 if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG) return vm->newDef; - else - return vm->def; + + return vm->def; } =20 =20 @@ -6028,7 +6028,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, VIR_XML_PROP_NONZERO, &scsisrc->sgio)) < 0) { return -1; - } else if (rv > 0) { + } + + if (rv > 0) { if (def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SC= SI) { virReportError(VIR_ERR_XML_ERROR, "%s", _("sgio is only supported for scsi host device"= )); @@ -6040,8 +6042,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, VIR_XML_PROP_NONE, &scsisrc->rawio)) < 0) { return -1; - } else if (rv > 0 && - def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE= _SCSI) { + } + + if (rv > 0 && def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_T= YPE_SCSI) { virReportError(VIR_ERR_XML_ERROR, "%s", _("rawio is only supported for scsi host device")); return -1; @@ -9913,9 +9916,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef = *def, =20 ctxt->node =3D cur; =20 - if ((nsources =3D virXPathNodeSet("./source", ctxt, &sources)) < 0) { + if ((nsources =3D virXPathNodeSet("./source", ctxt, &sources)) < 0) goto error; - } else if (nsources > 0) { + + if (nsources > 0) { /* Parse only the first source element since only one is used * for chardev devices, the only exception is UDP type, where * user can specify two source elements. */ @@ -9924,7 +9928,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *= def, _("only one source element is allowed for " "character device")); goto error; - } else if (nsources > 2) { + } + if (nsources > 2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("only two source elements are allowed for " "character device")); @@ -10004,9 +10009,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= f *def, } } =20 - if ((nlogs =3D virXPathNodeSet("./log", ctxt, &logs)) < 0) { + if ((nlogs =3D virXPathNodeSet("./log", ctxt, &logs)) < 0) goto error; - } else if (nlogs =3D=3D 1) { + + if (nlogs =3D=3D 1) { if (virDomainChrSourceDefParseLog(def, logs[0]) < 0) goto error; } else if (nlogs > 1) { @@ -10016,9 +10022,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= f *def, goto error; } =20 - if ((nprotocols =3D virXPathNodeSet("./protocol", ctxt, &protocols)) <= 0) { + if ((nprotocols =3D virXPathNodeSet("./protocol", ctxt, &protocols)) <= 0) goto error; - } else if (nprotocols =3D=3D 1) { + + if (nprotocols =3D=3D 1) { if (virDomainChrSourceDefParseProtocol(def, protocols[0]) < 0) goto error; } else if (nprotocols > 1) { --=20 2.35.3 From nobody Fri May 3 11:17:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1658403103; cv=none; d=zohomail.com; s=zohoarc; b=i3shaDKsr394eUmql8Y7/xDRwS5FoC/KxmltvUv82cDocyN8Xs4fG1gyc1oehXXXJyv1s2aakhRj/8WV4xdG/C+3iMzQocC8s/7SFeb/0ueE7YE9I4Vxeym6tx37ZJibt5EpWiHIaNcKla2FrL1doXQVxy1mSa6IbzrOufnCTLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658403103; 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; bh=yx3V23352EfvLnleshj/wBJ4oQaXEujR3p5U7s3zcWA=; b=GNL1+alOaLL3EMSfr2b73UAFOoB5WYyA5D63LdSkMA4ufTaUX0mDoyUI2j+D54lNblhElgvtQwM6imis0XsqfrdSWKGJdbWxUXPVRcwdkgvtW0Df5SJOe0sa9UCn57gb+dhAZt/brVV4WETb4Va6kTjdLJbu2H6D1j8VIjK62ZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 165840310396491.45345160401246; Thu, 21 Jul 2022 04:31:43 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-418-iImls1tNPVeAO8CXWz_Zww-1; Thu, 21 Jul 2022 07:31:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A0998060A1; Thu, 21 Jul 2022 11:31:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 148BD40D0166; Thu, 21 Jul 2022 11:31:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 03E90194034C; Thu, 21 Jul 2022 11:31:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C8FA51947040 for ; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AC7D340D0172; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 513CE40D0160 for ; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658403103; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=yx3V23352EfvLnleshj/wBJ4oQaXEujR3p5U7s3zcWA=; b=TT+koDNn+fkykuyvRl5nKcUpSg3BI8bQOgKBVdtkotgMFwMNAn0DPL9MBBm5jQeUX4Jnji 9lmMsRYVtsAWom+TlVc/jcWvbSOuVp0cqrROSt44lU8pxtkRV3/PtRb/2ZsrCqrck9EC36 MSUipgD+1etmFwcY92DbnReI7CSuXlQ= X-MC-Unique: iImls1tNPVeAO8CXWz_Zww-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/2] domain_conf: rewrite if else functions to switch Date: Thu, 21 Jul 2022 13:30:45 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658403104377100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Pattern of using switch instead of a long if else construction is used everywhere, so I used it here as well to make the code more consistent (and remove that else after return). I also included all the values from the enum. Signed-off-by: Kristina Hanicova Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 41d23cfe2a..a4b3a49086 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8055,19 +8055,26 @@ static int virDomainControllerModelTypeFromString(const virDomainControllerDef *def, const char *model) { - if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + switch ((virDomainControllerType)def->type) { + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: return virDomainControllerModelSCSITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + case VIR_DOMAIN_CONTROLLER_TYPE_USB: return virDomainControllerModelUSBTypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: return virDomainControllerModelPCITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: return virDomainControllerModelIDETypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: return virDomainControllerModelVirtioSerialTypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: return virDomainControllerModelISATypeFromString(model); - + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + return -1; + } return -1; } =20 @@ -8076,19 +8083,26 @@ static const char * virDomainControllerModelTypeToString(virDomainControllerDef *def, int model) { - if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + switch ((virDomainControllerType)def->type) { + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: return virDomainControllerModelSCSITypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + case VIR_DOMAIN_CONTROLLER_TYPE_USB: return virDomainControllerModelUSBTypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: return virDomainControllerModelPCITypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: return virDomainControllerModelIDETypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: return virDomainControllerModelVirtioSerialTypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: return virDomainControllerModelISATypeToString(model); - + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + return NULL; + } return NULL; } =20 --=20 2.35.3