[PATCH 21/348] Fix -Wsahdow warnings

[PATCH 21/348] Fix -Wsahdow warnings

[Andrey Smirnov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Fix -Wshadow warnings --]
[-- Type: text/x-diff, Size: 1343 bytes --]

From d17a56836ea91af85e584c7cfb467179345c46d3 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Tue, 22 Nov 2011 17:32:48 +0700
Subject: [PATCH 21/39] Fix -Wshadow warnings.

* annotate.c (annotate_array_section_begin): Fix -Wshadow
warnings.
---
 gdb/ChangeLog  |    5 +++++
 gdb/annotate.c |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4daf760..f6711e4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-22  Andrey Smirnov <andrew.smirnov@gmail.com>
 
+	* annotate.c (annotate_array_section_begin): Fix -Wshadow
+	warnings.
+
+2011-11-22  Andrey Smirnov <andrew.smirnov@gmail.com>
+
 	* amd64-tdep.c (amd64_push_dummy_call): Fix -Wshadow
 	warnings.
 
diff --git a/gdb/annotate.c b/gdb/annotate.c
index 2f0769a..93c65a1 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -522,11 +522,11 @@ annotate_frame_end (void)
 }
 \f
 void
-annotate_array_section_begin (int index, struct type *elttype)
+annotate_array_section_begin (int idx, struct type *elttype)
 {
   if (annotation_level == 2)
     {
-      printf_filtered (("\n\032\032array-section-begin %d "), index);
+      printf_filtered (("\n\032\032array-section-begin %d "), idx);
       print_value_flags (elttype);
       printf_filtered (("\n"));
     }
-- 
1.7.5.4

Re: [PATCH 21/348] Fix -Wsahdow warnings

[Tom Tromey]

>>>>> "Andrey" == Andrey Smirnov <andrew.smirnov@gmail.com> writes:

Andrey> * annotate.c (annotate_array_section_begin): Fix -Wshadow
Andrey> warnings.

Ok.

Tom

Re: [PATCH 21/348] Fix -Wsahdow warnings

[Mark Kettenis]

> From: Andrey Smirnov <andrew.smirnov@gmail.com>
> Date: Tue, 22 Nov 2011 20:03:12 +0700
> 
> * annotate.c (annotate_array_section_begin): Fix -Wshadow
> warnings.

Again, why does -Wshadow complain about this?

> diff --git a/gdb/annotate.c b/gdb/annotate.c
> index 2f0769a..93c65a1 100644
> --- a/gdb/annotate.c
> +++ b/gdb/annotate.c
> @@ -522,11 +522,11 @@ annotate_frame_end (void)
>  }
>  \f
>  void
> -annotate_array_section_begin (int index, struct type *elttype)
> +annotate_array_section_begin (int idx, struct type *elttype)
>  {
>    if (annotation_level == 2)
>      {
> -      printf_filtered (("\n\032\032array-section-begin %d "), index);
> +      printf_filtered (("\n\032\032array-section-begin %d "), idx);
>        print_value_flags (elttype);
>        printf_filtered (("\n"));
>      }
> -- 
> 1.7.5.4
> 
> 

Re: [PATCH 21/348] Fix -Wsahdow warnings

[Tom Tromey]

>>>>> "Mark" == Mark Kettenis <mark.kettenis@xs4all.nl> writes:

>> From: Andrey Smirnov <andrew.smirnov@gmail.com>
>> Date: Tue, 22 Nov 2011 20:03:12 +0700
>> 
>> * annotate.c (annotate_array_section_begin): Fix -Wshadow
>> warnings.

Mark> Again, why does -Wshadow complain about this?

'index' is an old form of strchr.
It is probably declared in his libc headers.

Tom