From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 24 Jun 2014 09:22:17 +0000 (+0200)
Subject: storage: gluster: Avoid name shadow on older compilers
X-Git-Tag: v1.2.6-rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cff94cc85b30d3a0a33af563bb4381f988a0f3a;p=thirdparty%2Flibvirt.git

storage: gluster: Avoid name shadow on older compilers

s/link/linkpath/g in virStorageFileBackendGlusterReadlinkCallback as
older gcc complains.
---

diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c
index c8077a1bf9..cab23b06f5 100644
--- a/src/storage/storage_backend_gluster.c
+++ b/src/storage/storage_backend_gluster.c
@@ -717,7 +717,7 @@ virStorageFileBackendGlusterAccess(virStorageSourcePtr src,
 
 static int
 virStorageFileBackendGlusterReadlinkCallback(const char *path,
-                                             char **link,
+                                             char **linkpath,
                                              void *data)
 {
     virStorageFileBackendGlusterPrivPtr priv = data;
@@ -726,7 +726,7 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path,
     ssize_t ret;
     struct stat st;
 
-    *link = NULL;
+    *linkpath = NULL;
 
     if (glfs_stat(priv->vol, path, &st) < 0) {
         virReportSystemError(errno,
@@ -754,7 +754,7 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path,
 
     buf[ret] = '\0';
 
-    *link = buf;
+    *linkpath = buf;
 
     return 0;