Simplify c_val_print_array

This slightly simplifies c_val_print_array by moving a variable to a
more inner scope and removing a dead assignment.

gdb/ChangeLog
2020-03-13  Tom Tromey  <tom@tromey.com>

	* c-valprint.c (c_val_print_array): Simplify.
This commit is contained in:
Tom Tromey 2020-03-13 17:39:52 -06:00
parent d121c6ce89
commit 7fe471e9ae
2 changed files with 5 additions and 6 deletions

View File

@ -1,3 +1,7 @@
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.

View File

@ -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);