提交 da5d031b 编写于 作者: S Sukrit Bhatnagar 提交者: Erik Skultety

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: NSukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 8d3f2d85
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册