From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 3 Dec 2021 08:34:03 +0000 (+0100)
Subject: virLogDaemonPostExecRestart: Use automatic freeing for variables
X-Git-Tag: v8.0.0-rc1~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8db183f6c731b02a2699f4397fe531a1fbcd7a23;p=thirdparty%2Flibvirt.git

virLogDaemonPostExecRestart: Use automatic freeing for variables

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index cc7889399b..a2a5b5f547 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -435,10 +435,10 @@ virLogDaemonPostExecRestart(const char *state_file,
                             virLogDaemonConfig *config)
 {
     const char *gotmagic;
-    char *wantmagic = NULL;
+    g_autofree char *wantmagic = NULL;
     int ret = -1;
-    char *state = NULL;
-    virJSONValue *object = NULL;
+    g_autofree char *state = NULL;
+    g_autoptr(virJSONValue) object = NULL;
 
     VIR_DEBUG("Running post-restart exec");
 
@@ -490,9 +490,6 @@ virLogDaemonPostExecRestart(const char *state_file,
 
  cleanup:
     unlink(state_file);
-    VIR_FREE(wantmagic);
-    VIR_FREE(state);
-    virJSONValueFree(object);
     return ret;
 }