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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f47c14fc09c1f42a06a85b1267f055cf095d094e..74ad18eb01073ff1d6ee29799e8fab3f05469f04 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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.

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 759ab43c723041eab5dea31145d717e4561b8f45..bee0c18abf8ea96aa0353d7347d4bb6b05935d8d 100644 (file)
--- 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);