提交 3538498d 编写于 作者: S Sukrit Bhatnagar 提交者: Erik Skultety

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: NSukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 06b90ed4
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "virerror.h" #include "virerror.h"
#include "datatypes.h" #include "datatypes.h"
#include "virlog.h" #include "virlog.h"
#include "viralloc.h"
#include "virthread.h" #include "virthread.h"
#include "virutil.h" #include "virutil.h"
#include "virstring.h" #include "virstring.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
# define __VIRT_ERROR_H_ # define __VIRT_ERROR_H_
# include "internal.h" # include "internal.h"
# include "viralloc.h"
# define VIR_ERROR_MAX_LENGTH 1024 # define VIR_ERROR_MAX_LENGTH 1024
...@@ -205,4 +206,6 @@ bool virLastErrorIsSystemErrno(int errnum); ...@@ -205,4 +206,6 @@ bool virLastErrorIsSystemErrno(int errnum);
void virErrorPreserveLast(virErrorPtr *saveerr); void virErrorPreserveLast(virErrorPtr *saveerr);
void virErrorRestore(virErrorPtr *savederr); void virErrorRestore(virErrorPtr *savederr);
VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError)
#endif #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册