提交 2ad02846 编写于 作者: S Sukrit Bhatnagar 提交者: Erik Skultety

util: firewall: 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 virFirewallPtr is declared using
VIR_AUTOPTR, the function virFirewallFree 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>
上级 d4e7ad8d
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <stdarg.h> #include <stdarg.h>
#include "viralloc.h"
#include "virfirewallpriv.h" #include "virfirewallpriv.h"
#include "virerror.h" #include "virerror.h"
#include "virutil.h" #include "virutil.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
# define __VIR_FIREWALL_H__ # define __VIR_FIREWALL_H__
# include "internal.h" # include "internal.h"
# include "viralloc.h"
typedef struct _virFirewall virFirewall; typedef struct _virFirewall virFirewall;
typedef virFirewall *virFirewallPtr; typedef virFirewall *virFirewallPtr;
...@@ -116,4 +117,6 @@ int virFirewallApply(virFirewallPtr firewall); ...@@ -116,4 +117,6 @@ int virFirewallApply(virFirewallPtr firewall);
void virFirewallSetLockOverride(bool avoid); void virFirewallSetLockOverride(bool avoid);
VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree)
#endif /* __VIR_FIREWALL_H__ */ #endif /* __VIR_FIREWALL_H__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册