util: hash: 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 variables of type virHashTablePtr are declared using
VIR_AUTOPTR, the function virHashFree 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/virhash.c b/src/util/virhash.c
index ecda55dba514261e3b5052d50c2ccdcf701383ad..006ffd8d7fe91398e34f419f1aaa8c8dcf807d34 100644 (file)
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -26,7 +26,6 @@
 
 #include "virerror.h"
 #include "virhash.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virhashcode.h"
 #include "virrandom.h"

diff --git a/src/util/virhash.h b/src/util/virhash.h
index 5b24fc0006cb5967f9b9acac3b8864b60a179ab5..dd789c6e519397d0e91b0cde996475b2b412118b 100644 (file)
--- a/src/util/virhash.h
+++ b/src/util/virhash.h
@@ -16,6 +16,8 @@
 # include <stdint.h>
 # include <stdbool.h>
 
+# include "viralloc.h"
+
 /*
  * The hash table.
  */
@@ -200,4 +202,6 @@ void *virHashSearch(const virHashTable *table, virHashSearcher iter,
 /* Convenience for when VIR_FREE(value) is sufficient as a data freer.  */
 void virHashValueFree(void *value, const void *name);
 
+VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree)
+
 #endif                          /* ! __VIR_HASH_H__ */