]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
ch: use g_auto in virCHMonitorBuildDisksJson
authorJán Tomko <jtomko@redhat.com>
Wed, 22 Sep 2021 20:49:27 +0000 (22:49 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 23 Sep 2021 13:32:00 +0000 (15:32 +0200)
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
src/ch/ch_monitor.c

index 3ef2c3fb15d4f3bb09d71537d308e24c84fbce7d..4ed31ec2eddc6c8159cc9bf5eb5728846cd058e2 100644 (file)
@@ -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