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

util: scsivhost: 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>
上级 cef6a257
......@@ -109,8 +109,7 @@ void
virSCSIVHostDeviceListDel(virSCSIVHostDeviceListPtr list,
virSCSIVHostDevicePtr dev)
{
virSCSIVHostDevicePtr tmp = virSCSIVHostDeviceListSteal(list, dev);
virSCSIVHostDeviceFree(tmp);
VIR_AUTOPTR(virSCSIVHostDevice) tmp = virSCSIVHostDeviceListSteal(list, dev);
}
......@@ -253,7 +252,8 @@ virSCSIVHostDeviceGetPath(virSCSIVHostDevicePtr dev)
virSCSIVHostDevicePtr
virSCSIVHostDeviceNew(const char *name)
{
virSCSIVHostDevicePtr dev;
VIR_AUTOPTR(virSCSIVHostDevice) dev = NULL;
virSCSIVHostDevicePtr ret = NULL;
if (VIR_ALLOC(dev) < 0)
return NULL;
......@@ -262,22 +262,18 @@ virSCSIVHostDeviceNew(const char *name)
virReportError(VIR_ERR_INTERNAL_ERROR,
_("dev->name buffer overflow: %s"),
name);
goto error;
return NULL;
}
if (virAsprintf(&dev->path, "%s/%s",
SYSFS_VHOST_SCSI_DEVICES, name) < 0)
goto error;
return NULL;
VIR_DEBUG("%s: initialized", dev->name);
cleanup:
return dev;
VIR_STEAL_PTR(ret, dev);
error:
virSCSIVHostDeviceFree(dev);
dev = NULL;
goto cleanup;
return ret;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册