External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-01 20:05:19 +00:00
Code

util: scsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types

Browse Source 
By making use of GNU C's cleanup attribute handled by the
VIR_AUTOFREE macro for declaring scalar variables, majority
of the VIR_FREE calls 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:28 +05:30 committed by Erik Skultety
parent 30783d36b2
commit 1ec5d3e983
1 changed files with 7 additions and 14 deletions

21
src/util/virscsi.c

@ -115,7 +115,7 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix,
{
DIR *dir = NULL;
struct dirent *entry;
char *path = NULL;
VIR_AUTOFREE(char *) path = NULL;
char *sg = NULL;
unsigned int adapter_id;
const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES;
@ -139,7 +139,6 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix,
cleanup:
VIR_DIR_CLOSE(dir);
VIR_FREE(path);
return sg;
}
@ -155,7 +154,7 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
{
DIR *dir = NULL;
struct dirent *entry;
char *path = NULL;
VIR_AUTOFREE(char *) path = NULL;
char *name = NULL;
unsigned int adapter_id;
const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES;
@ -178,7 +177,6 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
cleanup:
VIR_DIR_CLOSE(dir);
VIR_FREE(path);
return name;
}
@ -192,11 +190,11 @@ virSCSIDeviceNew(const char *sysfs_prefix,
bool shareable)
{
virSCSIDevicePtr dev, ret = NULL;
char *sg = NULL;
char *vendor_path = NULL;
char *model_path = NULL;
char *vendor = NULL;
char *model = NULL;
VIR_AUTOFREE(char *) sg = NULL;
VIR_AUTOFREE(char *) vendor_path = NULL;
VIR_AUTOFREE(char *) model_path = NULL;
VIR_AUTOFREE(char *) vendor = NULL;
VIR_AUTOFREE(char *) model = NULL;
const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES;
if (VIR_ALLOC(dev) < 0)
@ -247,11 +245,6 @@ virSCSIDeviceNew(const char *sysfs_prefix,
ret = dev;
cleanup:
VIR_FREE(sg);
VIR_FREE(vendor);
VIR_FREE(model);
VIR_FREE(vendor_path);
VIR_FREE(model_path);
if (!ret)
virSCSIDeviceFree(dev);
return ret;