From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 19 May 2021 14:10:09 +0000 (+0200)
Subject: virStorageAdapterParseXML: Use g_autofree
X-Git-Tag: v7.4.0-rc1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2d030e265b58b55ac526207afd96b9f116cd5d;p=thirdparty%2Flibvirt.git

virStorageAdapterParseXML: Use g_autofree

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c
index 6b5a58e1e7..717d00dc4a 100644
--- a/src/conf/storage_adapter_conf.c
+++ b/src/conf/storage_adapter_conf.c
@@ -168,9 +168,8 @@ virStorageAdapterParseXML(virStorageAdapter *adapter,
                           xmlNodePtr node,
                           xmlXPathContextPtr ctxt)
 {
-    int ret = -1;
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
-    char *adapter_type = NULL;
+    g_autofree char *adapter_type = NULL;
 
     ctxt->node = node;
 
@@ -180,27 +179,23 @@ virStorageAdapterParseXML(virStorageAdapter *adapter,
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("Unknown pool adapter type '%s'"),
                            adapter_type);
-            goto cleanup;
+            return -1;
         }
 
         if ((adapter->type == VIR_STORAGE_ADAPTER_TYPE_FC_HOST) &&
             (virStorageAdapterParseXMLFCHost(node, &adapter->data.fchost)) < 0)
-                goto cleanup;
+            return -1;
 
         if ((adapter->type == VIR_STORAGE_ADAPTER_TYPE_SCSI_HOST) &&
             (virStorageAdapterParseXMLSCSIHost(node, ctxt,
                                                &adapter->data.scsi_host)) < 0)
-                goto cleanup;
+            return -1;
     } else {
         if (virStorageAdapterParseXMLLegacy(node, ctxt, adapter) < 0)
-            goto cleanup;
+            return -1;
     }
 
-    ret = 0;
-
- cleanup:
-    VIR_FREE(adapter_type);
-    return ret;
+    return 0;
 }