From: Andrey Smirnov <ndreys@sourceware.org>
Date: Mon, 5 Dec 2011 04:10:47 +0000 (+0000)
Subject: * breakpoint.c (init_breakpoint_sal): Remove nested definitions of
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fbbd034ec595caf21bf441ec9778afbbbe2f57ca;p=binutils-gdb.git

* breakpoint.c (init_breakpoint_sal): Remove nested definitions of
  `i'(-Wshadow).
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9cbded963fc..971a1653200 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-05  Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+	* breakpoint.c (init_breakpoint_sal): Remove nested definitions of
+	`i'(-Wshadow).
+
 2011-12-05  Andrey Smirnov  <andrew.smirnov@gmail.com>
 
 	* bcache.c (bcache): Rename `bcache' to `cache'(-Wshadow).
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index fa800188593..c6b8e05baa2 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7265,9 +7265,11 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
 
   if (type == bp_hardware_breakpoint)
     {
-      int i = hw_breakpoint_used_count ();
-      int target_resources_ok = 
-	target_can_use_hardware_watchpoint (bp_hardware_breakpoint, 
+      int target_resources_ok;
+
+      i = hw_breakpoint_used_count ();
+      target_resources_ok =
+	target_can_use_hardware_watchpoint (bp_hardware_breakpoint,
 					    i + 1, 0);
       if (target_resources_ok == 0)
 	error (_("No hardware breakpoint support in the target."));
@@ -7316,7 +7318,6 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
 		  char *p = &addr_string[3];
 		  char *endp;
 		  char *marker_str;
-		  int i;
 
 		  p = skip_spaces (p);