From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 12 Feb 2021 10:32:46 +0000 (+0100)
Subject: qemuAgentMakeStringsArray: Refactor cleanup
X-Git-Tag: v7.1.0-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83a50fe2a587cb2f3cc7fb9447a9545106ca1545;p=thirdparty%2Flibvirt.git

qemuAgentMakeStringsArray: Refactor cleanup

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

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 4712aeb529..d6816ef9de 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1175,23 +1175,17 @@ static virJSONValuePtr
 qemuAgentMakeStringsArray(const char **strings, unsigned int len)
 {
     size_t i;
-    virJSONValuePtr ret = virJSONValueNewArray(), str;
+    g_autoptr(virJSONValue) ret = virJSONValueNewArray();
 
     for (i = 0; i < len; i++) {
-        str = virJSONValueNewString(strings[i]);
-        if (!str)
-            goto error;
+        g_autoptr(virJSONValue) str = virJSONValueNewString(strings[i]);
 
-        if (virJSONValueArrayAppend(ret, str) < 0) {
-            virJSONValueFree(str);
-            goto error;
-        }
+        if (virJSONValueArrayAppend(ret, str) < 0)
+            return NULL;
+        str = NULL;
     }
-    return ret;
 
- error:
-    virJSONValueFree(ret);
-    return NULL;
+    return g_steal_pointer(&ret);
 }
 
 void qemuAgentNotifyEvent(qemuAgentPtr agent,