From: Julian Seward <jseward@acm.org>
Date: Mon, 27 Oct 2008 21:42:36 +0000 (+0000)
Subject: Rename some local variables called 'index' to something else, to stop
X-Git-Tag: svn/VALGRIND_3_4_0~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ee7f5121419704f1eb42161cabbe91c3dc3ec21;p=thirdparty%2Fvalgrind.git

Rename some local variables called 'index' to something else, to stop
gcc-3.2.2 complaining they shadow some built-in global declaration of
'index'.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8715
---

diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index ea7a2c10ea..b5e6be4a16 100644
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -951,8 +951,8 @@ static Bool contained_within ( Addr outer, UWord n_outer,
    return False;
 }
 
-static void* INDEX_BIS ( void* base, Word index, Word scale ) {
-   return (void*)( ((UChar*)base) + index * scale );
+static void* INDEX_BIS ( void* base, Word idx, Word scale ) {
+   return (void*)( ((UChar*)base) + idx * scale );
 }
 
 static Addr round_Addr_upwards ( Addr a, UInt align ) 
diff --git a/coregrind/m_demangle/cplus-dem.c b/coregrind/m_demangle/cplus-dem.c
index 7c3cefac23..f69004fffe 100644
--- a/coregrind/m_demangle/cplus-dem.c
+++ b/coregrind/m_demangle/cplus-dem.c
@@ -4189,14 +4189,14 @@ register_Btype (struct work_stuff *work)
 
 static void
 remember_Btype (struct work_stuff *work, const char *start,
-                int len, int index)
+                int len, int indx)
 {
   char *tem;
 
   tem = XNEWVEC (char, len + 1);
   memcpy (tem, start, len);
   tem[len] = '\0';
-  work -> btypevec[index] = tem;
+  work -> btypevec[indx] = tem;
 }
 
 /* Lose all the info related to B and K type codes. */
diff --git a/helgrind/libhb_core.c b/helgrind/libhb_core.c
index fc232f7ec8..8903cf027d 100644
--- a/helgrind/libhb_core.c
+++ b/helgrind/libhb_core.c
@@ -1555,7 +1555,7 @@ Word VTS__cmp_structural ( VTS* a, VTS* b );
 void VTS__show ( HChar* buf, Int nBuf, VTS* vts );
 
 /* Debugging only.  Return vts[index], so to speak. */
-ULong VTS__indexAt_SLOW ( VTS* vts, Thr* index );
+ULong VTS__indexAt_SLOW ( VTS* vts, Thr* idx );
 
 #endif /* ! __HB_VTS_H */