From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 8 Mar 2019 13:28:07 +0000 (+0100)
Subject: conf: Simplify error paths in storage source component parsers
X-Git-Tag: v5.2.0-rc1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc76386d3362b78faf213193299e242a43d838e;p=thirdparty%2Flibvirt.git

conf: Simplify error paths in storage source component parsers

virDomainDiskSourcePrivateDataParse and virDomainDiskSourcePRParse don't
need the 'cleanup' label any more thanks to VIR_XPATH_NODE_AUTORESTORE.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 93147fabf9..0370eed120 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9028,7 +9028,6 @@ virDomainDiskSourcePrivateDataParse(xmlNodePtr node,
                                     virDomainXMLOptionPtr xmlopt)
 {
     VIR_XPATH_NODE_AUTORESTORE(ctxt);
-    int ret = -1;
 
     if (!(flags & VIR_DOMAIN_DEF_PARSE_STATUS) ||
         !xmlopt || !xmlopt->privateData.storageParse)
@@ -9036,18 +9035,13 @@ virDomainDiskSourcePrivateDataParse(xmlNodePtr node,
 
     ctxt->node = node;
 
-    if (!(ctxt->node = virXPathNode("./privateData", ctxt))) {
-        ret = 0;
-        goto cleanup;
-    }
+    if (!(ctxt->node = virXPathNode("./privateData", ctxt)))
+        return 0;
 
     if (xmlopt->privateData.storageParse(ctxt, src) < 0)
-        goto cleanup;
-
-    ret = 0;
+        return -1;
 
- cleanup:
-    return ret;
+    return 0;
 }
 
 
@@ -9057,21 +9051,16 @@ virDomainDiskSourcePRParse(xmlNodePtr node,
                            virStoragePRDefPtr *pr)
 {
     VIR_XPATH_NODE_AUTORESTORE(ctxt);
-    int ret = -1;
 
     ctxt->node = node;
 
-    if (!(ctxt->node = virXPathNode("./reservations", ctxt))) {
-        ret = 0;
-        goto cleanup;
-    }
+    if (!(ctxt->node = virXPathNode("./reservations", ctxt)))
+        return 0;
 
     if (!(*pr = virStoragePRDefParseXML(ctxt)))
-        goto cleanup;
+        return -1;
 
-    ret = 0;
- cleanup:
-    return ret;
+    return 0;
 }