From bdc76386d3362b78faf213193299e242a43d838e Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 8 Mar 2019 14:28:07 +0100 Subject: [PATCH] conf: Simplify error paths in storage source component parsers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit virDomainDiskSourcePrivateDataParse and virDomainDiskSourcePRParse don't need the 'cleanup' label any more thanks to VIR_XPATH_NODE_AUTORESTORE. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) 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; + return -1; - ret = 0; - - 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; }