1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00

Fix shadowed variable with older gcc

Commit 2cff94c fixed the shadowed 'link' added by commit 975f0e2,
but forgot the 'link' added by commit 08aa22e.
This commit is contained in:
Ján Tomko 2014-06-24 12:53:44 +02:00
parent bffe8d2ddf
commit ebd05fd562

View File

@ -542,16 +542,16 @@ static const char *testPathCanonicalizeSymlinks[][2] =
static int static int
testPathCanonicalizeReadlink(const char *path, testPathCanonicalizeReadlink(const char *path,
char **link, char **linkpath,
void *data ATTRIBUTE_UNUSED) void *data ATTRIBUTE_UNUSED)
{ {
size_t i; size_t i;
*link = NULL; *linkpath = NULL;
for (i = 0; i < ARRAY_CARDINALITY(testPathCanonicalizeSymlinks); i++) { for (i = 0; i < ARRAY_CARDINALITY(testPathCanonicalizeSymlinks); i++) {
if (STREQ(path, testPathCanonicalizeSymlinks[i][0])) { 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 -1;
return 0; return 0;