|
From: <sv...@va...> - 2005-10-14 11:13:21
|
Author: sewardj
Date: 2005-10-14 12:13:14 +0100 (Fri, 14 Oct 2005)
New Revision: 4919
Log:
Rename a local variable so as to make -Wshadow shut up.
Modified:
trunk/coregrind/m_demangle/cp-demangle.c
Modified: trunk/coregrind/m_demangle/cp-demangle.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_demangle/cp-demangle.c 2005-10-14 03:11:30 UTC (rev=
4918)
+++ trunk/coregrind/m_demangle/cp-demangle.c 2005-10-14 11:13:14 UTC (rev=
4919)
@@ -2152,10 +2152,10 @@
<pointer-to-member-type> ::=3D M </class/ type> </member/ type> */
=20
static status_t
-demangle_type_ptr (dm, insert_pos, substitution_start)
+demangle_type_ptr (dm, insert_pos, substitution_Start)
demangling_t dm;
int *insert_pos;
- int substitution_start;
+ int substitution_Start;
{
status_t status;
int is_substitution_candidate =3D 1;
@@ -2171,7 +2171,7 @@
advance_char (dm);
/* Demangle the underlying type. */
RETURN_IF_ERROR (demangle_type_ptr (dm, insert_pos,=20
- substitution_start));
+ substitution_Start));
/* Insert an asterisk where we're told to; it doesn't
necessarily go at the end. If we're doing Java style output,=20
there is no pointer symbol. */
@@ -2187,7 +2187,7 @@
advance_char (dm);
/* Demangle the underlying type. */
RETURN_IF_ERROR (demangle_type_ptr (dm, insert_pos,=20
- substitution_start));
+ substitution_Start));
/* Insert an ampersand where we're told to; it doesn't
necessarily go at the end. */
RETURN_IF_ERROR (result_insert_char (dm, *insert_pos, '&'));
@@ -2215,7 +2215,7 @@
type, which would in this case give `void () (int, int)'
and set *insert_pos to the spot between the first
parentheses. */
- status =3D demangle_type_ptr (dm, insert_pos, substitution_start);
+ status =3D demangle_type_ptr (dm, insert_pos, substitution_Start);
else if (peek_char (dm) =3D=3D 'A')
/* A pointer-to-member array variable. We want output that
looks like `int (Klass::*) [10]'. Demangle the array type
@@ -2297,7 +2297,7 @@
}
=20
if (is_substitution_candidate)
- RETURN_IF_ERROR (substitution_add (dm, substitution_start, 0));
+ RETURN_IF_ERROR (substitution_add (dm, substitution_Start, 0));
=20
return STATUS_OK;
}
|