From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Date: Tue, 24 Jul 2018 15:52:02 +0000 (+0530)
Subject: util: error: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC
X-Git-Tag: v4.6.0-rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3538498d241dd8e533ecef6df14201d47295cf42;p=thirdparty%2Flibvirt.git

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 5f26d59777..4688e019cc 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 760bfa43df..31577c5c8c 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