From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 13 Dec 2021 18:28:27 +0000 (+0100)
Subject: openvz: refactor openvzVEGetStringParam
X-Git-Tag: v8.0.0-rc1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a56179646b5520fbeac822a15d15aa91e7507bd;p=thirdparty%2Flibvirt.git

openvz: refactor openvzVEGetStringParam

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index d14254c231..9419ce122c 100644
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -58,27 +58,22 @@ char*
 openvzVEGetStringParam(virDomainPtr domain, const char* param)
 {
     int len;
-    char *output = NULL;
+    g_autofree char *output = NULL;
 
-    virCommand *cmd = virCommandNewArgList(VZLIST,
-                                             "-o",
-                                             param,
-                                             domain->name,
-                                             "-H", NULL);
+    g_autoptr(virCommand) cmd = virCommandNewArgList(VZLIST,
+                                                     "-o",
+                                                     param,
+                                                     domain->name,
+                                                     "-H", NULL);
 
     virCommandSetOutputBuffer(cmd, &output);
-    if (virCommandRun(cmd, NULL) < 0) {
-        VIR_FREE(output);
-        /* virCommandRun sets the virError */
-        goto cleanup;
-    }
+    if (virCommandRun(cmd, NULL) < 0)
+        return NULL;
 
     /* delete trailing newline */
     len = strlen(output);
     if (len && output[len - 1] == '\n')
         output[len - 1] = '\0';
 
- cleanup:
-    virCommandFree(cmd);
-    return output;
+    return g_steal_pointer(&output);
 }