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.
The type virError and the declaration of virFreeError is done in
include/libvirt/virterror.h which is pulled in by internal.h.
When a variable of type virErrorPtr is declared using
VIR_AUTOPTR, the function virFreeError will be run
automatically on it when it goes out of scope.
Signed-off-by: Sukrit Bhatnagar
---
src/util/virerror.c | 1 -
src/util/virerror.h | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 5f26d59..4688e01 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -30,7 +30,6 @@
#include "virerror.h"
#include "datatypes.h"
#include "virlog.h"
-#include "viralloc.h"
#include "virthread.h"
#include "virutil.h"
#include "virstring.h"
diff --git a/src/util/virerror.h b/src/util/virerror.h
index 760bfa4..31577c5 100644
--- a/src/util/virerror.h
+++ b/src/util/virerror.h
@@ -23,6 +23,7 @@
# define __VIRT_ERROR_H_
# include "internal.h"
+# include "viralloc.h"
# define VIR_ERROR_MAX_LENGTH 1024
@@ -205,4 +206,6 @@ bool virLastErrorIsSystemErrno(int errnum);
void virErrorPreserveLast(virErrorPtr *saveerr);
void virErrorRestore(virErrorPtr *savederr);
+VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError)
+
#endif
--
1.8.3.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
