提交 0c5e7435 编写于 作者: S Sukrit Bhatnagar 提交者: Erik Skultety

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: NSukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 d0a92a03
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "virerror.h" #include "virerror.h"
#include "virhash.h" #include "virhash.h"
#include "viralloc.h"
#include "virlog.h" #include "virlog.h"
#include "virhashcode.h" #include "virhashcode.h"
#include "virrandom.h" #include "virrandom.h"
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
# include <stdint.h> # include <stdint.h>
# include <stdbool.h> # include <stdbool.h>
# include "viralloc.h"
/* /*
* The hash table. * The hash table.
*/ */
...@@ -200,4 +202,6 @@ void *virHashSearch(const virHashTable *table, virHashSearcher iter, ...@@ -200,4 +202,6 @@ void *virHashSearch(const virHashTable *table, virHashSearcher iter,
/* Convenience for when VIR_FREE(value) is sufficient as a data freer. */ /* Convenience for when VIR_FREE(value) is sufficient as a data freer. */
void virHashValueFree(void *value, const void *name); void virHashValueFree(void *value, const void *name);
VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree)
#endif /* ! __VIR_HASH_H__ */ #endif /* ! __VIR_HASH_H__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册