util: error: 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 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 <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 5f26d5977766219afc5b943fe1178696414679de..4688e019ccb6d4405698ed7ee87802cde1e1afa9 100644 (file)
--- 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 760bfa43df07490a5091486348a7f70e7a5c1e5c..31577c5c8c6692c74f458cc7f77a3b6043a2e8a9 100644 (file)
--- 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