This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 17/348] Fix -Wshadow warnings
- From: Andrey Smirnov <andrew dot smirnov at gmail dot com>
- To: gdb-patches at sourceware dot org
- Date: Sat, 19 Nov 2011 10:56:25 +0700
- Subject: [PATCH 17/348] Fix -Wshadow warnings
>From 7869889e77285eb5633ad733de6ca3e701620937 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Nov 2011 10:20:49 +0700
Subject: [PATCH 17/18] Fix Wshadow
---
gdb/ChangeLog | 4 +++
gdb/ada-valprint.c | 69 ++++++++++++++++++++++++++-------------------------
2 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3ad1442..54284cf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+ * ada-valprint.c (ada_val_print_1): Fix -Wshadow warnings.
+
+2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+
* ada-lang.c (add_lookup_simple_minsym): Fix -Wshadow warnings.
2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 8a72b9e..1009bf3 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -673,10 +673,8 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
const struct value *original_value,
const struct value_print_options *options)
{
- unsigned int len;
int i;
struct type *elttype;
- LONGEST val;
int offset_aligned;
type = ada_check_typedef (type);
@@ -822,37 +820,40 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
}
case TYPE_CODE_ENUM:
- if (options->format)
- {
- val_print_scalar_formatted (type, valaddr, offset_aligned,
- original_value, options, 0, stream);
- break;
- }
- len = TYPE_NFIELDS (type);
- val = unpack_long (type, valaddr + offset_aligned);
- for (i = 0; i < len; i++)
- {
- QUIT;
- if (val == TYPE_FIELD_BITPOS (type, i))
- {
- break;
- }
- }
- if (i < len)
- {
- const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i));
-
- if (name[0] == '\'')
- fprintf_filtered (stream, "%ld %s", (long) val, name);
- else
- fputs_filtered (name, stream);
- }
- else
- {
- print_longest (stream, 'd', 0, val);
- }
- break;
-
+ {
+ const unsigned int len = TYPE_NFIELDS (type);
+ const LONGEST val = unpack_long (type, valaddr + offset_aligned);
+
+
+ if (options->format)
+ {
+ val_print_scalar_formatted (type, valaddr, offset_aligned,
+ original_value, options, 0, stream);
+ break;
+ }
+ for (i = 0; i < len; i++)
+ {
+ QUIT;
+ if (val == TYPE_FIELD_BITPOS (type, i))
+ {
+ break;
+ }
+ }
+ if (i < len)
+ {
+ const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i));
+
+ if (name[0] == '\'')
+ fprintf_filtered (stream, "%ld %s", (long) val, name);
+ else
+ fputs_filtered (name, stream);
+ }
+ else
+ {
+ print_longest (stream, 'd', 0, val);
+ }
+ break;
+ }
case TYPE_CODE_FLAGS:
if (options->format)
val_print_scalar_formatted (type, valaddr, offset_aligned,
@@ -912,7 +913,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
deref_val_int = unpack_pointer (type, valaddr + offset_aligned);
if (deref_val_int != 0)
{
- struct value *deref_val =
+ deref_val =
ada_value_ind (value_from_pointer
(lookup_pointer_type (elttype),
deref_val_int));
--
1.7.5.4