From: Tom Tromey <tom@tromey.com>
Date: Sun, 22 Apr 2018 16:46:03 +0000 (-0600)
Subject: Shadowing fix in gdbscm_frame_read_var
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d951f98b3c8bf202571327d8679ae30ca1da9fdc;p=deliverable%2Fbinutils-gdb.git

Shadowing fix in gdbscm_frame_read_var

-Wshadow=local pointed out that the shadowing in gdbscm_frame_read_var
means that the ultimate call to read_var_value will always be passed
block==NULL.  The fix is to remove the inner declaration.

gdb/ChangeLog
2018-10-04  Tom Tromey  <tom@tromey.com>

	* guile/scm-frame.c (gdbscm_frame_read_var): Remove inner
	declaration of "block".
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 42c55edf4c..3bf08bcb4b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-04  Tom Tromey  <tom@tromey.com>
+
+	* guile/scm-frame.c (gdbscm_frame_read_var): Remove inner
+	declaration of "block".
+
 2018-10-04  Tom Tromey  <tom@tromey.com>
 
 	* common/filestuff.c (fdwalk): Remove inner declaration of
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c
index 3d27907e19..5a056de332 100644
--- a/gdb/guile/scm-frame.c
+++ b/gdb/guile/scm-frame.c
@@ -878,7 +878,6 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest)
     }
   else if (scm_is_string (symbol_scm))
     {
-      const struct block *block = NULL;
       struct gdb_exception except = exception_none;
 
       if (! SCM_UNBNDP (block_scm))