From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Wed, 2 Sep 2020 20:25:37 +0000 (-0300)
Subject: cpu_ppc64.c: modernize ppc64VendorParse()
X-Git-Tag: v6.8.0-rc1~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a79ba15546de1c44a67ec320556d19eafbbfce2d;p=thirdparty%2Flibvirt.git

cpu_ppc64.c: modernize ppc64VendorParse()

Use g_autoptr() in virCPUppc64VendorPtr and remove the now
uneeded 'cleanup' label.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index b003e48bed..6c73145f06 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -279,8 +279,7 @@ ppc64VendorParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED,
                  void *data)
 {
     struct ppc64_map *map = data;
-    virCPUppc64VendorPtr vendor;
-    int ret = -1;
+    g_autoptr(virCPUppc64Vendor) vendor = NULL;
 
     if (VIR_ALLOC(vendor) < 0)
         return -1;
@@ -290,17 +289,13 @@ ppc64VendorParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED,
     if (ppc64VendorFind(map, vendor->name)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("CPU vendor %s already defined"), vendor->name);
-        goto cleanup;
+        return -1;
     }
 
     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
-        goto cleanup;
-
-    ret = 0;
+        return -1;
 
- cleanup:
-    ppc64VendorFree(vendor);
-    return ret;
+    return 0;
 }