FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* breakpoint.c (insert_breakpoint_locations): Rename `error' to

Browse source 
`error_flag'(-Wshadow).
This commit is contained in:
Andrey Smirnov 2011-12-11 02:53:28 +00:00
parent ad13d8dfa3
commit eacd795a56
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2011-12-10 Andrey Smirnov <andrew.smirnov@gmail.com>
* breakpoint.c (insert_breakpoint_locations): Rename `error' to
`error_flag'(-Wshadow).
2011-12-10 Andrey Smirnov <andrew.smirnov@gmail.com> 2011-12-10 Andrey Smirnov <andrew.smirnov@gmail.com>
* bfd-target.c (target_bfd_reopen): Rename `bfd' to * bfd-target.c (target_bfd_reopen): Rename `bfd' to

8
gdb/breakpoint.c
View file

@ -1974,7 +1974,7 @@ insert_breakpoint_locations (void)
{ {
struct breakpoint *bpt; struct breakpoint *bpt;
struct bp_location *bl, **blp_tmp; struct bp_location *bl, **blp_tmp;
int error = 0; int error_flag = 0;
int val = 0; int val = 0;
int disabled_breaks = 0; int disabled_breaks = 0;
int hw_breakpoint_error = 0; int hw_breakpoint_error = 0;
@ -2013,7 +2013,7 @@ insert_breakpoint_locations (void)
val = insert_bp_location (bl, tmp_error_stream, &disabled_breaks, val = insert_bp_location (bl, tmp_error_stream, &disabled_breaks,
&hw_breakpoint_error); &hw_breakpoint_error);
if (val) if (val)
error = val; error_flag = val;
} }
/* If we failed to insert all locations of a watchpoint, remove /* If we failed to insert all locations of a watchpoint, remove
@ -2048,11 +2048,11 @@ insert_breakpoint_locations (void)
fprintf_unfiltered (tmp_error_stream, fprintf_unfiltered (tmp_error_stream,
"Could not insert hardware watchpoint %d.\n", "Could not insert hardware watchpoint %d.\n",
bpt->number); bpt->number);
error = -1; error_flag = -1;
} }
} }
if (error) if (error_flag)
{ {
/* If a hardware breakpoint or watchpoint was inserted, add a /* If a hardware breakpoint or watchpoint was inserted, add a
message about possibly exhausted resources. */ message about possibly exhausted resources. */