This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 2/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:24:14 +0700
- Subject: [PATCH 2/348] Fix -Wshadow warnings
>From 7525933570cce1a23f308c7c239504f3dfb34096 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Nov 2011 09:02:26 +0700
Subject: [PATCH 02/18] Fix Wshadow warnings
---
gdb/ChangeLog | 4 ++++
gdb/ada-lang.c | 12 ++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 951793c..b01c29d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+ * ada-lang.c (thin_descriptor_type): Fix -Wshadow warnings.
+
+2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+
* ada-exp.y: Fix -Wshadow warnings.
2011-11-18 Yao Qi <yao@codesourcery.com>
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 2edbe7f..da4cf3e 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -1421,18 +1421,18 @@ is_thin_pntr (struct type *type)
static struct type *
thin_descriptor_type (struct type *type)
{
- struct type *base_type = desc_base_type (type);
+ struct type *btype = desc_base_type (type);
- if (base_type == NULL)
+ if (btype == NULL)
return NULL;
- if (is_suffix (ada_type_name (base_type), "___XVE"))
- return base_type;
+ if (is_suffix (ada_type_name (btype), "___XVE"))
+ return btype;
else
{
- struct type *alt_type = ada_find_parallel_type (base_type, "___XVE");
+ struct type *alt_type = ada_find_parallel_type (btype, "___XVE");
if (alt_type == NULL)
- return base_type;
+ return btype;
else
return alt_type;
}
--
1.7.5.4