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

ch: use g_auto in virCHMonitorBuildNetsJson

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 669eae2dc3..6a1b62b4a2 100644
--- a/src/ch/ch_monitor.c
+++ b/src/ch/ch_monitor.c
@@ -345,7 +345,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, virDomainNetDef *netdef)
 static int
 virCHMonitorBuildNetsJson(virJSONValue *content, virDomainDef *vmdef)
 {
-    virJSONValue *nets;
+    g_autoptr(virJSONValue) nets = NULL;
     size_t i;
 
     if (vmdef->nnets > 0) {
@@ -353,17 +353,13 @@ virCHMonitorBuildNetsJson(virJSONValue *content, virDomainDef *vmdef)
 
         for (i = 0; i < vmdef->nnets; i++) {
             if (virCHMonitorBuildNetJson(nets, vmdef->nets[i]) < 0)
-                goto cleanup;
+                return -1;
         }
         if (virJSONValueObjectAppend(content, "net", &nets) < 0)
-            goto cleanup;
+            return -1;
     }
 
     return 0;
-
- cleanup:
-    virJSONValueFree(nets);
-    return -1;
 }
 
 static int