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: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index ef216b377c81a2eef617f2f864fbd32a65c025f4..280d0dc2fd1c3a7a10b27b08fe551f7d63727c14 100644 (file)
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -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;
 }