]> xenbits.xensource.com Git - libvirt.git/commitdiff
virLogDaemonPostExecRestart: Use automatic freeing for variables
authorPeter Krempa <pkrempa@redhat.com>
Fri, 3 Dec 2021 08:34:03 +0000 (09:34 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 7 Dec 2021 08:00:39 +0000 (09:00 +0100)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/logging/log_daemon.c

index cc7889399bf04f03c54f00cbd196aa0498709ed6..a2a5b5f547ede22ff94d997a38620fa76e855616 100644 (file)
@@ -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;
 }