util: usb: 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 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@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/util/virusb.c b/src/util/virusb.c
index 78182320ed4125e2b407c333af74d2da14e66f47..90f947bb9d87bc788888c2cc9d51b485743792a1 100644 (file)
--- 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 078dee69cd23c8ce88735ebd06bf10c691819561..afaaf953db9e3a24134ae6e6e9bf4771a45d645f 100644 (file)
--- 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__ */