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 ea7a2c10ea8a77294b6843990be2e89cfd6a4042..b5e6be4a1671b9b9ecad6f3c73f36889a2ea9531 100644 (file)
--- 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 7c3cefac23f24c03adb9f0248258b8d47b8337da..f69004fffe8bf54774976745d8ec724c5c549727 100644 (file)
--- 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 fc232f7ec8bf4ea33386a3846e0a24c500cfcd4c..8903cf027dd62389bf786ae9a34bdb2149443f15 100644 (file)
--- 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 */