NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: usb: use VIR_AUTOPTR for aggregate types

Browse Source 
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>
This commit is contained in:
Sukrit Bhatnagar 2018-07-24 21:22:26 +05:30 committed by Erik Skultety
parent 8d3f2d8508
commit da5d031bd6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/virusb.c
View File

@ -123,8 +123,9 @@ virUSBDeviceSearch(unsigned int vendor,
bool found = false; bool found = false;
char *ignore = NULL; char *ignore = NULL;
struct dirent *de; struct dirent *de;
virUSBDeviceListPtr list = NULL, ret = NULL; virUSBDeviceListPtr list = NULL;
virUSBDevicePtr usb; virUSBDeviceListPtr ret = NULL;
VIR_AUTOPTR(virUSBDevice) usb = NULL;
int direrr; int direrr;
if (!(list = virUSBDeviceListNew())) if (!(list = virUSBDeviceListNew()))
@ -173,13 +174,12 @@ virUSBDeviceSearch(unsigned int vendor,
} }
usb = virUSBDeviceNew(found_bus, found_devno, vroot); usb = virUSBDeviceNew(found_bus, found_devno, vroot);
if (!usb) if (!usb)
goto cleanup; goto cleanup;
if (virUSBDeviceListAdd(list, &usb) < 0) { if (virUSBDeviceListAdd(list, &usb) < 0)
virUSBDeviceFree(usb);
goto cleanup; goto cleanup;
}
if (found) if (found)
break; break;
@ -508,8 +508,7 @@ void
virUSBDeviceListDel(virUSBDeviceListPtr list, virUSBDeviceListDel(virUSBDeviceListPtr list,
virUSBDevicePtr dev) virUSBDevicePtr dev)
{ {
virUSBDevicePtr ret = virUSBDeviceListSteal(list, dev); VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev);
virUSBDeviceFree(ret);
} }
virUSBDevicePtr virUSBDevicePtr