From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 4 Nov 2020 11:08:19 +0000 (+0100)
Subject: util: use g_autofree in virSCSIHostGetUniqueId
X-Git-Tag: v6.10.0-rc1~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=843b70995471c1a20822ee62ff084310066b4b4a;p=thirdparty%2Flibvirt.git

util: use g_autofree in virSCSIHostGetUniqueId

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
index c259e63000..4d314c3ceb 100644
--- a/src/util/virscsihost.c
+++ b/src/util/virscsihost.c
@@ -46,17 +46,16 @@ int
 virSCSIHostGetUniqueId(const char *sysfs_prefix,
                        int host)
 {
-    char *sysfs_path = NULL;
+    g_autofree char *sysfs_path = NULL;
     char *p = NULL;
-    int ret = -1;
-    char *buf = NULL;
+    g_autofree char *buf = NULL;
     int unique_id;
 
     sysfs_path = g_strdup_printf("%s/host%d/unique_id",
                                  sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
 
     if (virFileReadAll(sysfs_path, 1024, &buf) < 0)
-        goto cleanup;
+        return -1;
 
     if ((p = strchr(buf, '\n')))
         *p = '\0';
@@ -65,15 +64,10 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unable to parse unique_id: %s"), buf);
 
-        goto cleanup;
+        return -1;
     }
 
-    ret = unique_id;
-
- cleanup:
-    VIR_FREE(sysfs_path);
-    VIR_FREE(buf);
-    return ret;
+    return unique_id;
 }