From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 24 Jun 2014 10:53:44 +0000 (+0200)
Subject: Fix shadowed variable with older gcc
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ebd05fd562fba8257f61a4561ce54553357d5914;p=libvirt.git

Fix shadowed variable with older gcc

Commit 2cff94c fixed the shadowed 'link' added by commit 975f0e2,
but forgot the 'link' added by commit 08aa22e.
---

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index f86d25cf2d..e85dc6e8e6 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -542,16 +542,16 @@ static const char *testPathCanonicalizeSymlinks[][2] =
 
 static int
 testPathCanonicalizeReadlink(const char *path,
-                             char **link,
+                             char **linkpath,
                              void *data ATTRIBUTE_UNUSED)
 {
     size_t i;
 
-    *link = NULL;
+    *linkpath = NULL;
 
     for (i = 0; i < ARRAY_CARDINALITY(testPathCanonicalizeSymlinks); i++) {
         if (STREQ(path, testPathCanonicalizeSymlinks[i][0])) {
-            if (VIR_STRDUP(*link, testPathCanonicalizeSymlinks[i][1]) < 0)
+            if (VIR_STRDUP(*linkpath, testPathCanonicalizeSymlinks[i][1]) < 0)
                 return -1;
 
             return 0;