util: netdevvlan: 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 virNetDevVlanPtr is declared using
VIR_AUTOPTR, the function virNetDevVlanFree 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/virnetdevvlan.c b/src/util/virnetdevvlan.c
index 4c8bce599389b57d63680d4ea5c7d45795a1334f..0afc47b6e6b0c5ea28c2baad590acc31c634ce74 100644 (file)
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -24,7 +24,6 @@
 #include "internal.h"
 #include "virerror.h"
 #include "virnetdevvlan.h"
-#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h
index 7f636260961072bee7bb56f047e5f0477d8aab77..be85f59897ec767adb67b402495d9327f24262cb 100644 (file)
--- a/src/util/virnetdevvlan.h
+++ b/src/util/virnetdevvlan.h
@@ -23,6 +23,8 @@
 
 # include <virutil.h>
 
+# include "viralloc.h"
+
 typedef enum {
     VIR_NATIVE_VLAN_MODE_DEFAULT = 0,
     VIR_NATIVE_VLAN_MODE_TAGGED,
@@ -48,4 +50,6 @@ void virNetDevVlanFree(virNetDevVlanPtr vlan);
 int virNetDevVlanEqual(const virNetDevVlan *a, const virNetDevVlan *b);
 int virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlan *src);
 
+VIR_DEFINE_AUTOPTR_FUNC(virNetDevVlan, virNetDevVlanFree)
+
 #endif /* __VIR_NETDEV_VLAN_H__ */