From nobody Sun Feb 8 19:56:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552924569809261.93098041308065; Mon, 18 Mar 2019 08:56:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 27F948F874; Mon, 18 Mar 2019 15:56:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0508D17CFE; Mon, 18 Mar 2019 15:56:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 84B6B181A272; Mon, 18 Mar 2019 15:56:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2IFtfxN022727 for ; Mon, 18 Mar 2019 11:55:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73E931001E81; Mon, 18 Mar 2019 15:55:41 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0BF71001DC8 for ; Mon, 18 Mar 2019 15:55:40 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 18 Mar 2019 16:55:07 +0100 Message-Id: <43a6d4c082eb019463080981d1cd780ded2cea5f.1552924270.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 18/34] conf: Refactor control flow in virDomainDiskBackingStoreParse X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 18 Mar 2019 15:56:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The function does not have any code in the 'cleanup' label so we can simplify the control flow. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ef164f3375..d74ac2f1fb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9151,19 +9151,16 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr c= txt, { VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr source; - int ret =3D -1; VIR_AUTOUNREF(virStorageSourcePtr) backingStore =3D NULL; VIR_AUTOFREE(char *) type =3D NULL; VIR_AUTOFREE(char *) format =3D NULL; VIR_AUTOFREE(char *) idx =3D NULL; - if (!(ctxt->node =3D virXPathNode("./backingStore", ctxt))) { - ret =3D 0; - goto cleanup; - } + if (!(ctxt->node =3D virXPathNode("./backingStore", ctxt))) + return 0; if (!(backingStore =3D virStorageSourceNew())) - goto cleanup; + return -1; /* backing store is always read-only */ backingStore->readonly =3D true; @@ -9171,52 +9168,49 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr c= txt, /* terminator does not have a type */ if (!(type =3D virXMLPropString(ctxt->node, "type"))) { VIR_STEAL_PTR(src->backingStore, backingStore); - ret =3D 0; - goto cleanup; + return 0; } if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && (idx =3D virXMLPropString(ctxt->node, "index")) && virStrToLong_uip(idx, NULL, 10, &backingStore->id) < 0) { virReportError(VIR_ERR_XML_ERROR, _("invalid disk index '%s'"), id= x); - goto cleanup; + return -1; } backingStore->type =3D virStorageTypeFromString(type); if (backingStore->type <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk backing store type '%s'"), type); - goto cleanup; + return -1; } if (!(format =3D virXPathString("string(./format/@type)", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing disk backing store format")); - goto cleanup; + return -1; } backingStore->format =3D virStorageFileFormatTypeFromString(format); if (backingStore->format <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk backing store format '%s'"), format= ); - goto cleanup; + return -1; } if (!(source =3D virXPathNode("./source", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing disk backing store source")); - goto cleanup; + return -1; } if (virDomainDiskSourceParse(source, ctxt, backingStore, flags, xmlopt= ) < 0 || virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) = < 0) - goto cleanup; + return -1; VIR_STEAL_PTR(src->backingStore, backingStore); - ret =3D 0; - cleanup: - return ret; + return 0; } #define PARSE_IOTUNE(val) \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list