]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Fix shadowed variable with older gcc
authorJán Tomko <jtomko@redhat.com>
Tue, 24 Jun 2014 10:53:44 +0000 (12:53 +0200)
committerJán Tomko <jtomko@redhat.com>
Tue, 24 Jun 2014 10:53:44 +0000 (12:53 +0200)
Commit 2cff94c fixed the shadowed 'link' added by commit 975f0e2,
but forgot the 'link' added by commit 08aa22e.

tests/virstoragetest.c

index f86d25cf2dc2bd305478564ed299368156f84c3d..e85dc6e8e6d032b827204e3fc93a62eb4b84cd3b 100644 (file)
@@ -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;