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

diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index 10c370a2aec0883177e92334cb8dd6db911c8dd7..dfd792f596b6dd0d6df42c56dd9383a8ef8d404b 100644 (file)
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -27,7 +27,6 @@
 
 #include <stdarg.h>
 
-#include "viralloc.h"
 #include "virfirewallpriv.h"
 #include "virerror.h"
 #include "virutil.h"

diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index b04ab4870dba6fbbc170c72c1b85bdec96b069b1..e024e88cc2ce81252d4e59d53dfe98dc5ca30b40 100644 (file)
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -25,6 +25,7 @@
 # define __VIR_FIREWALL_H__
 
 # include "internal.h"
+# include "viralloc.h"
 
 typedef struct _virFirewall virFirewall;
 typedef virFirewall *virFirewallPtr;
@@ -116,4 +117,6 @@ int virFirewallApply(virFirewallPtr firewall);
 
 void virFirewallSetLockOverride(bool avoid);
 
+VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree)
+
 #endif /* __VIR_FIREWALL_H__ */