]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
cpu_ppc64.c: modernize ppc64VendorParse()
authorDaniel Henrique Barboza <danielhb413@gmail.com>
Wed, 2 Sep 2020 20:25:37 +0000 (17:25 -0300)
committerJán Tomko <jtomko@redhat.com>
Tue, 8 Sep 2020 16:13:15 +0000 (18:13 +0200)
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>
src/cpu/cpu_ppc64.c

index b003e48bed5fe95ccbb6a0fc510e07814ed02f45..6c73145f06ecc8525665e0fdcce3d7c91d762cc2 100644 (file)
@@ -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;
 }