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 virUSBDevicePtr is declared using
VIR_AUTOPTR, the function virUSBDeviceFree will be run
automatically on it when it goes out of scope.
Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@xxxxxxxxx>
Reviewed-by: Erik Skultety <eskultet@xxxxxxxxxx>
---
src/util/virusb.c | 1 -
src/util/virusb.h | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/util/virusb.c b/src/util/virusb.c
index 7818232..90f947b 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -35,7 +35,6 @@
#include "virusb.h"
#include "virlog.h"
-#include "viralloc.h"
#include "virutil.h"
#include "virerror.h"
#include "virfile.h"
diff --git a/src/util/virusb.h b/src/util/virusb.h
index 078dee6..afaaf95 100644
--- a/src/util/virusb.h
+++ b/src/util/virusb.h
@@ -27,6 +27,7 @@
# include "internal.h"
# include "virobject.h"
+# include "viralloc.h"
# define USB_DEVFS "/dev/bus/usb/"
@@ -99,4 +100,6 @@ void virUSBDeviceListDel(virUSBDeviceListPtr list,
virUSBDevicePtr virUSBDeviceListFind(virUSBDeviceListPtr list,
virUSBDevicePtr dev);
+VIR_DEFINE_AUTOPTR_FUNC(virUSBDevice, virUSBDeviceFree)
+
#endif /* __VIR_USB_H__ */
--
1.8.3.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
