From 7d48863994082180cf61f25797a553f7cddcd311 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Sun, 27 Feb 2011 21:24:27 +0000 Subject: [PATCH] 2011-02-27 Michael Snyder * d-valprint.c (dynamic_array_type): Avoid shadowing a function param with a local variable of the same name. --- gdb/ChangeLog | 5 +++++ gdb/d-valprint.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ab012b22fea..a2d9a053175 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-02-27 Michael Snyder + + * d-valprint.c (dynamic_array_type): Avoid shadowing a function + param with a local variable of the same name. + 2011-02-27 Michael Snyder * value.c (value_from_history_ref): New function. diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c index 969cfe2d6a9..e8430995e99 100644 --- a/gdb/d-valprint.c +++ b/gdb/d-valprint.c @@ -45,7 +45,7 @@ dynamic_array_type (struct type *type, const gdb_byte *valaddr, struct type *elttype; struct type *true_type; struct type *ptr_type; - struct value *val; + struct value *ival; int length; length = unpack_field_as_long (type, valaddr + embedded_offset, 0); @@ -58,12 +58,12 @@ dynamic_array_type (struct type *type, const gdb_byte *valaddr, true_type = check_typedef (elttype); true_type = lookup_array_range_type (true_type, 0, length - 1); - val = value_at (true_type, addr); + ival = value_at (true_type, addr); return d_val_print (true_type, - value_contents_for_printing (val), - value_embedded_offset (val), addr, - stream, recurse + 1, val, options); + value_contents_for_printing (ival), + value_embedded_offset (ival), addr, + stream, recurse + 1, ival, options); } return -1; } -- 2.30.2