From: John Ferlan <jferlan@redhat.com>
Date: Tue, 12 Feb 2019 11:23:01 +0000 (-0500)
Subject: storage: Cleanup virStorageFileBackendGlusterReadlinkCallback
X-Git-Tag: v5.1.0-rc1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ee7294beda77262275450275a0a554989516e33;p=thirdparty%2Flibvirt.git

storage: Cleanup virStorageFileBackendGlusterReadlinkCallback

Rather than having two exit paths, let's use a @retval value
and VIR_STEAL_PTR in order to unite the exit path through the
error label.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_gluster.c
index f8bbde8cfe..41c66c5a5d 100644
--- a/src/storage/storage_file_gluster.c
+++ b/src/storage/storage_file_gluster.c
@@ -262,6 +262,7 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path,
     size_t bufsiz = 0;
     ssize_t ret;
     struct stat st;
+    int retval = -1;
 
     *linkpath = NULL;
 
@@ -291,13 +292,13 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path,
 
     buf[ret] = '\0';
 
-    *linkpath = buf;
+    VIR_STEAL_PTR(*linkpath, buf);
 
-    return 0;
+    retval = 0;
 
  error:
     VIR_FREE(buf);
-    return -1;
+    return retval;
 }