From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 11 Feb 2014 15:35:33 +0000 (+0100)
Subject: Rename 'index' in virCapabilitiesGetCpusForNode
X-Git-Tag: v1.2.2-rc1~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47fa97a7998531a82313c3d529a373cfd5358860;p=thirdparty%2Flibvirt.git

Rename 'index' in virCapabilitiesGetCpusForNode

This shadows the index function on some systems (RHEL-6.4, FreeBSD 9):
../../src/conf/capabilities.c: In function 'virCapabilitiesGetCpusForNode':
../../src/conf/capabilities.c:1005: warning: declaration of'index'
      shadows a global declaration [-Wshadow]
/usr/include/strings.h:57: warning: shadowed declaration is here [-Wshadow]
---

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 78f65cbf66..c1c4ab8280 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1002,11 +1002,11 @@ virCapabilitiesGetCpusForNode(virCapsPtr caps,
 {
     virCapsHostNUMACellPtr cell = NULL;
     size_t cpu;
-    size_t index;
+    size_t i;
     /* The numa node numbers can be non-contiguous. Ex: 0,1,16,17. */
-    for (index = 0; index < caps->host.nnumaCell; index++) {
-        if (caps->host.numaCell[index]->num == node) {
-            cell = caps->host.numaCell[index];
+    for (i = 0; i < caps->host.nnumaCell; i++) {
+        if (caps->host.numaCell[i]->num == node) {
+            cell = caps->host.numaCell[i];
             break;
         }
     }