From de724295687b4a7a7183dc73e5fbbbdea9a59971 Mon Sep 17 00:00:00 2001 From: ndreys Date: Mon, 5 Dec 2011 04:10:47 +0000 Subject: [PATCH] * breakpoint.c (init_breakpoint_sal): Remove nested definitions of `i'(-Wshadow). --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9cbded963f..971a165320 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-12-05 Andrey Smirnov + * breakpoint.c (init_breakpoint_sal): Remove nested definitions of + `i'(-Wshadow). + +2011-12-05 Andrey Smirnov + * bcache.c (bcache): Rename `bcache' to `cache'(-Wshadow). 2011-12-05 Andrey Smirnov diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index fa80018859..c6b8e05baa 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); -- 2.11.0