diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/c-valprint.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f47c14f..74ad18e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2020-03-13 Tom Tromey <tom@tromey.com> + * c-valprint.c (c_val_print_array): Simplify. + +2020-03-13 Tom Tromey <tom@tromey.com> + * valprint.c (value_print_array_elements): New function. * valprint.h (value_print_array_elements): Declare. diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 759ab43..bee0c18 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -247,7 +247,6 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, LONGEST low_bound, high_bound; int eltlen, len; enum bfd_endian byte_order = type_byte_order (type); - unsigned int i = 0; /* Number of characters printed. */ if (!get_array_bounds (type, &low_bound, &high_bound)) error (_("Could not determine the array high bound")); @@ -307,10 +306,10 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, LA_PRINT_STRING (stream, unresolved_elttype, valaddr + embedded_offset * unit_size, len, NULL, force_ellipses, options); - i = len; } else { + unsigned int i = 0; fprintf_filtered (stream, "{"); /* If this is a virtual function table, print the 0th entry specially, and the rest of the members @@ -321,10 +320,6 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, _("%d vtable entries"), len - 1); } - else - { - i = 0; - } val_print_array_elements (type, embedded_offset, address, stream, recurse, original_value, options, i); |