[libvirt] [PATCH] Fix shadowed variable with older gcc

Ján Tomko jtomko at redhat.com
Tue Jun 24 10:58:18 UTC 2014


Commit 2cff94c fixed the shadowed 'link' added by commit 975f0e2,
but forgot the 'link' added by commit 08aa22e.
---
Pushed as a build-breaker fix.

 tests/virstoragetest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index f86d25c..e85dc6e 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;
-- 
1.8.5.5




More information about the libvir-list mailing list