Fix -Wshadow warning in libiberty/cp-demangle.c

valgrind contains a copy of the libiberty demangler which gets compiled
with -Wshadow. That shows the following warning:

cp-demangle.c: In function ‘d_substitution’:
cp-demangle.c:3772:35: warning: declaration of ‘c’ shadows a previous local
        struct demangle_component *c;
                                   ^
cp-demangle.c:3708:8: note: shadowed declaration is here
   char c;
        ^

Fix that by renaming the struct demangle_component variable to dc.

libiberty/ChangeLog:

	* cp-demangle.c (d_substitution): Change struct demangle_component
	variable name from c to dc.

From-SVN: r240068

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 0b97a904c6fe60ae1326fbfbb1d970f38d527e69..68609599786c6527c5fe00cbaeff442bf8cdc777 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-10  Mark Wielaard  <mjw@redhat.com>
+
+       * cp-demangle.c (d_substitution): Change struct demangle_component
+       variable name from c to dc.
+
 2016-08-12  Marek Polacek  <polacek@redhat.com>
 
        PR c/7652

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 1c2bce291797824c071abeeb5252d2d5df3855ad..a843dc38f98c42ea0e6fd7a27d307d37dad27035 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -3769,7 +3769,7 @@ d_substitution (struct d_info *di, int prefix)
            {
              const char *s;
              int len;
-             struct demangle_component *c;
+             struct demangle_component *dc;
 
              if (p->set_last_name != NULL)
                di->last_name = d_make_sub (di, p->set_last_name,
@@ -3785,15 +3785,15 @@ d_substitution (struct d_info *di, int prefix)
                  len = p->simple_len;
                }
              di->expansion += len;
-             c = d_make_sub (di, s, len);
+             dc = d_make_sub (di, s, len);
              if (d_peek_char (di) == 'B')
                {
                  /* If there are ABI tags on the abbreviation, it becomes
                     a substitution candidate.  */
-                 c = d_abi_tags (di, c);
-                 d_add_substitution (di, c);
+                 dc = d_abi_tags (di, dc);
+                 d_add_substitution (di, dc);
                }
-             return c;
+             return dc;
            }
        }