aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/ada-lang.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6d7a7cf..2917022 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-20 Joel Brobecker <brobecker@adacore.com>
+
+ * ada-lang.c (to_fixed_array_type): Rename local variable
+ typename into type_name.
+
2015-05-19 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix ASAN crash for gdb.compile/compile.exp.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f789108..782447a 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -8582,16 +8582,16 @@ to_fixed_array_type (struct type *type0, struct value *dval,
if (index_type_desc == NULL)
{
- const char *typename = ada_type_name (type0);
+ const char *type_name = ada_type_name (type0);
- if (typename != NULL)
+ if (type_name != NULL)
{
- const int len = strlen (typename);
+ const int len = strlen (type_name);
char *name = (char *) alloca (len + strlen (xa_suffix));
- if (typename[len - 1] == 'P')
+ if (type_name[len - 1] == 'P')
{
- strcpy (name, typename);
+ strcpy (name, type_name);
strcpy (name + len - 1, xa_suffix);
index_type_desc = ada_find_parallel_type_with_name (type0, name);
}