From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Date: Tue, 24 Jul 2018 15:52:26 +0000 (+0530)
Subject: util: usb: use VIR_AUTOPTR for aggregate types
X-Git-Tag: v4.6.0-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da5d031bd60402ff6b96d2a0a8ee40806676561d;p=thirdparty%2Flibvirt.git

util: usb: use VIR_AUTOPTR for aggregate types

By making use of GNU C's cleanup attribute handled by the
VIR_AUTOPTR macro for declaring aggregate pointer variables,
majority of the calls to *Free functions can be dropped, which
in turn leads to getting rid of most of our cleanup sections.

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 47b407b7e5..609d54836f 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -123,8 +123,9 @@ virUSBDeviceSearch(unsigned int vendor,
     bool found = false;
     char *ignore = NULL;
     struct dirent *de;
-    virUSBDeviceListPtr list = NULL, ret = NULL;
-    virUSBDevicePtr usb;
+    virUSBDeviceListPtr list = NULL;
+    virUSBDeviceListPtr ret = NULL;
+    VIR_AUTOPTR(virUSBDevice) usb = NULL;
     int direrr;
 
     if (!(list = virUSBDeviceListNew()))
@@ -173,13 +174,12 @@ virUSBDeviceSearch(unsigned int vendor,
         }
 
         usb = virUSBDeviceNew(found_bus, found_devno, vroot);
+
         if (!usb)
             goto cleanup;
 
-        if (virUSBDeviceListAdd(list, &usb) < 0) {
-            virUSBDeviceFree(usb);
+        if (virUSBDeviceListAdd(list, &usb) < 0)
             goto cleanup;
-        }
 
         if (found)
             break;
@@ -508,8 +508,7 @@ void
 virUSBDeviceListDel(virUSBDeviceListPtr list,
                     virUSBDevicePtr dev)
 {
-    virUSBDevicePtr ret = virUSBDeviceListSteal(list, dev);
-    virUSBDeviceFree(ret);
+    VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev);
 }
 
 virUSBDevicePtr