util: authconfig: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC

Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in
src/util/viralloc.h, define a new wrapper around an existing
cleanup function which will be called when a variable declared
with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant
viralloc.h include, since that has moved from the source module into the
header.

When a variable of type virAuthConfigPtr is declared using
VIR_AUTOPTR, the function virAuthConfigFree will be run
automatically on it when it goes out of scope.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/util/virauth.c b/src/util/virauth.c
index adb093e101efc2abe8589f6e7ceaae074fa7a32e..c6a2ce7685056fca6ba2234c6bc2335606740b6f 100644 (file)
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -26,7 +26,6 @@
 
 #include "virauth.h"
 #include "virutil.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "virerror.h"

diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 91c9c0c56e1c2e9c1cbfac64d6c542a03944de97..3487cc2906ef4bfbe8c0789a60a2f97b556f9a46 100644 (file)
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -25,7 +25,6 @@
 #include "virauthconfig.h"
 
 #include "virkeyfile.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virerror.h"
 #include "virstring.h"

diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h
index ac0ceebe689a7c16f3d81cffac6fc56602ab621a..d8a3849e7370d4e78beebedc2e1c0325a844c43b 100644 (file)
--- a/src/util/virauthconfig.h
+++ b/src/util/virauthconfig.h
@@ -24,6 +24,7 @@
 # define __VIR_AUTHCONFIG_H__
 
 # include "internal.h"
+# include "viralloc.h"
 
 typedef struct _virAuthConfig virAuthConfig;
 typedef virAuthConfig *virAuthConfigPtr;
@@ -42,4 +43,6 @@ int virAuthConfigLookup(virAuthConfigPtr auth,
                         const char *credname,
                         const char **value);
 
+VIR_DEFINE_AUTOPTR_FUNC(virAuthConfig, virAuthConfigFree)
+
 #endif /* __VIR_AUTHCONFIG_H__ */