This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 6/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:27:06 +0700
- Subject: [PATCH 6/348] Fix -Wshadow warnings
>From a8f2e8f0e72ae1694fe5950b728b171494006e7c Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Nov 2011 09:32:14 +0700
Subject: [PATCH 06/18] Fix Wshadow
---
gdb/ChangeLog | 5 +++++
gdb/ada-lang.c | 14 +++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 97f2dc4..a633c28 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+ * ada-lang.c (find_old_style_renaming_symbol): Fix -Wshadow
+ warnings.
+
+2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+
* ada-lang.c (assign_component): Fix -Wshadow warnings.
2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 3304c4d..cc0513c 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -6953,7 +6953,7 @@ static struct symbol *
find_old_style_renaming_symbol (const char *name, struct block *block)
{
const struct symbol *function_sym = block_linkage_function (block);
- char *rename;
+ char *symname;
if (function_sym != NULL)
{
@@ -6987,20 +6987,20 @@ find_old_style_renaming_symbol (const char *name, struct block *block)
function_name_len -= 5;
}
- rename = (char *) alloca (rename_len * sizeof (char));
- strncpy (rename, function_name, function_name_len);
- xsnprintf (rename + function_name_len, rename_len - function_name_len,
+ symname = (char *) alloca (rename_len * sizeof (char));
+ strncpy (symname, function_name, function_name_len);
+ xsnprintf (symname + function_name_len, rename_len - function_name_len,
"__%s___XR", name);
}
else
{
const int rename_len = strlen (name) + 6;
- rename = (char *) alloca (rename_len * sizeof (char));
- xsnprintf (rename, rename_len * sizeof (char), "%s___XR", name);
+ symname = (char *) alloca (rename_len * sizeof (char));
+ xsnprintf (symname, rename_len * sizeof (char), "%s___XR", name);
}
- return ada_find_any_symbol (rename);
+ return ada_find_any_symbol (symname);
}
/* Because of GNAT encoding conventions, several GDB symbols may match a
--
1.7.5.4