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

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 4c8bce5993..0afc47b6e6 100644
--- 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 7f63626096..be85f59897 100644
--- 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__ */