From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 1 Oct 2019 09:50:34 +0000 (+0100)
Subject: util: convert virSystemdActivation to use VIR_DEFINE_AUTOPTR_FUNC
X-Git-Tag: v5.9.0-rc1~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d9326795fbbfa833797fa9eed9ab12682cb316;p=thirdparty%2Flibvirt.git

util: convert virSystemdActivation to use VIR_DEFINE_AUTOPTR_FUNC

Using the standard macro will facilitate the conversion to glib's
auto cleanup macros.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index 2efc0dd72c..c2e4c3df51 100644
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -917,7 +917,7 @@ virSystemdActivationNew(virSystemdActivationMap *map,
     return act;
 
  error:
-    virSystemdActivationFree(&act);
+    virSystemdActivationFree(act);
     return NULL;
 }
 
@@ -1046,12 +1046,12 @@ virSystemdActivationClaimFDs(virSystemdActivationPtr act,
  * associated with the activation object
  */
 void
-virSystemdActivationFree(virSystemdActivationPtr *act)
+virSystemdActivationFree(virSystemdActivationPtr act)
 {
-    if (!*act)
+    if (!act)
         return;
 
-    virHashFree((*act)->fds);
+    virHashFree(act->fds);
 
-    VIR_FREE(*act);
+    VIR_FREE(act);
 }
diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h
index 5f1a4413fe..2c0a0d8dc0 100644
--- a/src/util/virsystemd.h
+++ b/src/util/virsystemd.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include "internal.h"
+#include "virautoclean.h"
 
 typedef struct _virSystemdActivation virSystemdActivation;
 typedef virSystemdActivation *virSystemdActivationPtr;
@@ -81,6 +82,6 @@ void virSystemdActivationClaimFDs(virSystemdActivationPtr act,
                                   int **fds,
                                   size_t *nfds);
 
-void virSystemdActivationFree(virSystemdActivationPtr *act);
+void virSystemdActivationFree(virSystemdActivationPtr act);
 
-#define virSystemdActivationAutoPtrFree virSystemdActivationFree
+VIR_DEFINE_AUTOPTR_FUNC(virSystemdActivation, virSystemdActivationFree);
diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
index 3add1ab56f..d33a7c192f 100644
--- a/tests/virsystemdtest.c
+++ b/tests/virsystemdtest.c
@@ -650,7 +650,7 @@ testActivationEmpty(const void *opaque ATTRIBUTE_UNUSED)
 
     if (act != NULL) {
         fprintf(stderr, "Unexpectedly got activation object");
-        virSystemdActivationFree(&act);
+        virSystemdActivationFree(act);
         return -1;
     }