From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Tue, 16 Apr 2013 12:16:37 +0000 (-0400)
Subject: Fix compilation error in util/vircgroup.c
X-Git-Tag: v1.0.5-rc1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb171f60f313fd09b91216dfce8465ae2031da5;p=thirdparty%2Flibvirt.git

Fix compilation error in util/vircgroup.c

Fix the error

util/vircgroup.c: In function 'virCgroupNewDomainPartition':
util/vircgroup.c:1299:11: error: declaration of 'dirname' shadows a global declaration [-Werror=shadow]


Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index c23c893e63..5a2a75c9a3 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1296,13 +1296,13 @@ int virCgroupNewDomainPartition(virCgroupPtr partition,
                                 virCgroupPtr *group)
 {
     int rc;
-    char *dirname = NULL;
+    char *grpname = NULL;
 
-    if (virAsprintf(&dirname, "%s.%s.libvirt",
+    if (virAsprintf(&grpname, "%s.%s.libvirt",
                     name, driver) < 0)
         return -ENOMEM;
 
-    rc = virCgroupNew(dirname, partition, -1, group);
+    rc = virCgroupNew(grpname, partition, -1, group);
 
     if (rc == 0) {
         /*
@@ -1322,7 +1322,7 @@ int virCgroupNewDomainPartition(virCgroupPtr partition,
         }
     }
 
-    VIR_FREE(dirname);
+    VIR_FREE(grpname);
     return rc;
 }
 #else