From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 19 Oct 2021 12:48:16 +0000 (+0200)
Subject: qemuMonitorJSONBlockStatsUpdateCapacityOne: Refactor cleanup
X-Git-Tag: v7.9.0-rc1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c93bf6164799946c6218088d665c01b0081c724a;p=thirdparty%2Flibvirt.git

qemuMonitorJSONBlockStatsUpdateCapacityOne: Refactor cleanup

Use automatic memory clearing for the temporary variable and remove the
cleanup section.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index af6e918e06..e4f4dba79a 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2631,13 +2631,12 @@ qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValue *image,
                                            GHashTable *stats,
                                            bool backingChain)
 {
-    int ret = -1;
-    char *entry_name = qemuDomainStorageAlias(dev_name, depth);
+    g_autofree char *entry_name = qemuDomainStorageAlias(dev_name, depth);
     virJSONValue *backing;
 
     if (qemuMonitorJSONBlockStatsUpdateCapacityData(image, entry_name,
                                                     stats, NULL) < 0)
-        goto cleanup;
+        return -1;
 
     if (backingChain &&
         (backing = virJSONValueObjectGetObject(image, "backing-image")) &&
@@ -2646,12 +2645,9 @@ qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValue *image,
                                                    depth + 1,
                                                    stats,
                                                    true) < 0)
-        goto cleanup;
+        return -1;
 
-    ret = 0;
- cleanup:
-    VIR_FREE(entry_name);
-    return ret;
+    return 0;
 }