From: Simon Marchi <simon.marchi@ericsson.com>
Date: Thu, 9 Jul 2015 15:15:40 +0000 (-0400)
Subject: Remove unneeded variable assignment
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6b93c346364866f96529fb03557eb43e0434fa5;p=binutils-gdb.git

Remove unneeded variable assignment

The assignment to i in the TYPE_CODE_PTR section is not useful.
Removing it allows to move i in a narrower scope, which will help
things somewhere in the next patches.

gdb/ChangeLog:

	* c-valprint.c (c_val_print): Remove an assignment to i and move
	its declaration.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c7d0ddc0505..443565a765d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* c-valprint.c (c_val_print): Remove an assignment to i and move
+	its declaration.
+
 2015-07-09  Yao Qi  <yao.qi@linaro.org>
 
 	* aarch64-linux-nat.c (aarch64_linux_get_debug_reg_capacity): Add
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 8d8b7447516..e8a2fc70199 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -139,7 +139,6 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
 {
   struct gdbarch *gdbarch = get_type_arch (type);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  unsigned int i = 0;	/* Number of characters printed.  */
   unsigned len;
   struct type *elttype, *unresolved_elttype;
   struct type *unresolved_type = type;
@@ -149,6 +148,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
   CHECK_TYPEDEF (type);
   switch (TYPE_CODE (type))
     {
+    unsigned int i = 0;	/* Number of characters printed.  */
     case TYPE_CODE_ARRAY:
       unresolved_elttype = TYPE_TARGET_TYPE (type);
       elttype = check_typedef (unresolved_elttype);
@@ -300,9 +300,9 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
 	    {
 	      if (want_space)
 		fputs_filtered (" ", stream);
-	      i = val_print_string (unresolved_elttype, NULL,
-				    addr, -1,
-				    stream, options);
+	      val_print_string (unresolved_elttype, NULL,
+				addr, -1,
+				stream, options);
 	    }
 	  else if (cp_is_vtbl_member (type))
 	    {