From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 27 Jan 2015 12:36:10 +0000 (+0100)
Subject: Fix shadowed variable warning
X-Git-Tag: v1.2.13-rc1~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0ab79e9cdb930d99dcb2d9b017262d5efbfb0e0;p=thirdparty%2Flibvirt.git

Fix shadowed variable warning

libvirtd.c: In function 'daemonSetupAccessManager':
libvirtd.c:730:18: error: declaration of 'driver' shadows
  a global declaration [-Werror=shadow]
     const char **driver = (const char **)config->access_drivers;
                  ^
In file included from libvirtd.c:95:0:
../src/node_device/node_device_driver.h:43:36: error: shadowed
  declaration is here [-Werror=shadow]
 extern virNodeDeviceDriverStatePtr driver;
                                    ^
---

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 5ccfcdd154..86accaa3bc 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -727,13 +727,13 @@ daemonSetupAccessManager(struct daemonConfig *config)
 {
     virAccessManagerPtr mgr;
     const char *none[] = { "none", NULL };
-    const char **driver = (const char **)config->access_drivers;
+    const char **drv = (const char **)config->access_drivers;
 
-    if (!driver ||
-        !driver[0])
-        driver = none;
+    if (!drv ||
+        !drv[0])
+        drv = none;
 
-    if (!(mgr = virAccessManagerNewStack(driver)))
+    if (!(mgr = virAccessManagerNewStack(drv)))
         return -1;
 
     virAccessManagerSetDefault(mgr);