From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Thu, 19 Dec 2019 08:22:16 +0000 (+0100)
Subject: rpc: Use g_autofree in virNetClientNewLibssh()
X-Git-Tag: v6.0.0-rc1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=998cd537228283a4e009a7de6f8ce916c7379d9d;p=thirdparty%2Flibvirt.git

rpc: Use g_autofree in virNetClientNewLibssh()

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 75e653fec8..1b882a261a 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -545,13 +545,13 @@ virNetClientPtr virNetClientNewLibssh(const char *host,
     virNetClientPtr ret = NULL;
 
     virBuffer buf = VIR_BUFFER_INITIALIZER;
-    char *nc = NULL;
-    char *command = NULL;
+    g_autofree char *nc = NULL;
+    g_autofree char *command = NULL;
 
-    char *homedir = NULL;
-    char *confdir = NULL;
-    char *knownhosts = NULL;
-    char *privkey = NULL;
+    g_autofree char *homedir = NULL;
+    g_autofree char *confdir = NULL;
+    g_autofree char *knownhosts = NULL;
+    g_autofree char *privkey = NULL;
 
     /* Use default paths for known hosts an public keys if not provided */
     if (knownHostsPath) {
@@ -609,12 +609,6 @@ virNetClientPtr virNetClientNewLibssh(const char *host,
         goto cleanup;
 
  cleanup:
-    VIR_FREE(command);
-    VIR_FREE(privkey);
-    VIR_FREE(knownhosts);
-    VIR_FREE(homedir);
-    VIR_FREE(confdir);
-    VIR_FREE(nc);
     return ret;
 
  no_memory: