From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 6 Jul 2021 11:38:05 +0000 (+0200)
Subject: virSystemdActivationNew: Use automatic memory management
X-Git-Tag: v7.6.0-rc1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b565bf40b6a64ade389b113edc5cc1d8ee8015d;p=thirdparty%2Flibvirt.git

virSystemdActivationNew: Use automatic memory management

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index 6417dc6ea7..f90c17e767 100644
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -958,11 +958,10 @@ virSystemdActivationNew(virSystemdActivationMap *map,
                         size_t nmap,
                         int nfds)
 {
-    virSystemdActivation *act;
+    g_autoptr(virSystemdActivation) act = g_new0(virSystemdActivation, 1);
     const char *fdnames;
 
     VIR_DEBUG("Activated with %d FDs", nfds);
-    act = g_new0(virSystemdActivation, 1);
 
     act->fds = virHashNew(virSystemdActivationEntryFree);
 
@@ -976,10 +975,9 @@ virSystemdActivationNew(virSystemdActivationMap *map,
     }
 
     VIR_DEBUG("Created activation object for %d FDs", nfds);
-    return act;
+    return g_steal_pointer(&act);
 
  error:
-    virSystemdActivationFree(act);
     return NULL;
 }