From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 22 Sep 2021 20:49:27 +0000 (+0200)
Subject: ch: use g_auto in virCHMonitorBuildDisksJson
X-Git-Tag: v7.8.0-rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1149a6ddc7e73c6a6506d3ae9d09da85fe2108d5;p=thirdparty%2Flibvirt.git

ch: use g_auto in virCHMonitorBuildDisksJson

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c
index 3ef2c3fb15..4ed31ec2ed 100644
--- a/src/ch/ch_monitor.c
+++ b/src/ch/ch_monitor.c
@@ -222,7 +222,7 @@ virCHMonitorBuildDiskJson(virJSONValue *disks, virDomainDiskDef *diskdef)
 static int
 virCHMonitorBuildDisksJson(virJSONValue *content, virDomainDef *vmdef)
 {
-    virJSONValue *disks;
+    g_autoptr(virJSONValue) disks = NULL;
     size_t i;
 
     if (vmdef->ndisks > 0) {
@@ -230,17 +230,13 @@ virCHMonitorBuildDisksJson(virJSONValue *content, virDomainDef *vmdef)
 
         for (i = 0; i < vmdef->ndisks; i++) {
             if (virCHMonitorBuildDiskJson(disks, vmdef->disks[i]) < 0)
-                goto cleanup;
+                return -1;
         }
         if (virJSONValueObjectAppend(content, "disks", &disks) < 0)
-            goto cleanup;
+            return -1;
     }
 
     return 0;
-
- cleanup:
-    virJSONValueFree(disks);
-    return -1;
 }
 
 static int