From: Jean-Baptiste Rouault <jean-baptiste.rouault@diateam.net>
Date: Wed, 9 Apr 2014 06:50:24 +0000 (+0200)
Subject: build: avoid compiler warning on shadowed name
X-Git-Tag: v1.2.4-rc1~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a18c71301363d9accec5c26e8798b2615e68ef05;p=thirdparty%2Flibvirt.git

build: avoid compiler warning on shadowed name

Introduced in commit d1e55de3.
virstoragetest.c: In function ‘testStorageChain’:
virstoragetest.c:249:10: warning: declaration of ‘abs’ shadows a global
declaration [-Wshadow]
---

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 74ad15c8a1..bfdee8cf41 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -246,7 +246,7 @@ testStorageChain(const void *args)
     virStorageFileMetadataPtr elt;
     size_t i = 0;
     char *broken = NULL;
-    bool abs = !!(data->flags & ABS_START);
+    bool isAbs = !!(data->flags & ABS_START);
 
     meta = virStorageFileGetMetadata(data->start, data->format, -1, -1,
                                      (data->flags & ALLOW_PROBE) != 0);
@@ -292,7 +292,7 @@ testStorageChain(const void *args)
             goto cleanup;
         }
 
-        expDirectory = abs ? data->files[i]->expDirectoryAbs
+        expDirectory = isAbs ? data->files[i]->expDirectoryAbs
             : data->files[i]->expDirectoryRel;
         if (virAsprintf(&expect,
                         "store:%s\nraw:%s\ndirectory:%s\nother:%d %d %lld %d",