diff options
| author | Andrey Smirnov <ndreys@sourceware.org> | 2011-12-05 04:10:47 +0000 |
|---|---|---|
| committer | Andrey Smirnov <ndreys@sourceware.org> | 2011-12-05 04:10:47 +0000 |
| commit | fbbd034ec595caf21bf441ec9778afbbbe2f57ca (patch) | |
| tree | 4cf78ec0d54f369757da336da09dd0f7665e9976 /gdb | |
| parent | 12747160cdd53394993534cba8b791c59187530a (diff) | |
| download | gdb-fbbd034ec595caf21bf441ec9778afbbbe2f57ca.zip gdb-fbbd034ec595caf21bf441ec9778afbbbe2f57ca.tar.gz gdb-fbbd034ec595caf21bf441ec9778afbbbe2f57ca.tar.bz2 | |
* breakpoint.c (init_breakpoint_sal): Remove nested definitions of
`i'(-Wshadow).
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9cbded9..971a165 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 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). 2011-12-05 Andrey Smirnov <andrew.smirnov@gmail.com> diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index fa80018..c6b8e05 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); |