aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorAndrey Smirnov <ndreys@sourceware.org>2011-12-11 02:53:28 +0000
committerAndrey Smirnov <ndreys@sourceware.org>2011-12-11 02:53:28 +0000
commiteacd795a56bb22fe085272b724f6e02a11bb820c (patch)
treef76580e6f0d9030bde55fb161e4582a4d67c39a8 /gdb
parentad13d8dfa3f77ae30c6b69d649c36e160044ffe4 (diff)
downloadgdb-eacd795a56bb22fe085272b724f6e02a11bb820c.zip
gdb-eacd795a56bb22fe085272b724f6e02a11bb820c.tar.gz
gdb-eacd795a56bb22fe085272b724f6e02a11bb820c.tar.bz2
* breakpoint.c (insert_breakpoint_locations): Rename `error' to
`error_flag'(-Wshadow).
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/breakpoint.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a7d7ccc..b385559 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
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>
+
* bfd-target.c (target_bfd_reopen): Rename `bfd' to
`abfd'(-Wshadow).
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 47559ba..e683c20 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1974,7 +1974,7 @@ insert_breakpoint_locations (void)
{
struct breakpoint *bpt;
struct bp_location *bl, **blp_tmp;
- int error = 0;
+ int error_flag = 0;
int val = 0;
int disabled_breaks = 0;
int hw_breakpoint_error = 0;
@@ -2013,7 +2013,7 @@ insert_breakpoint_locations (void)
val = insert_bp_location (bl, tmp_error_stream, &disabled_breaks,
&hw_breakpoint_error);
if (val)
- error = val;
+ error_flag = val;
}
/* If we failed to insert all locations of a watchpoint, remove
@@ -2048,11 +2048,11 @@ insert_breakpoint_locations (void)
fprintf_unfiltered (tmp_error_stream,
"Could not insert hardware watchpoint %d.\n",
bpt->number);
- error = -1;
+ error_flag = -1;
}
}
- if (error)
+ if (error_flag)
{
/* If a hardware breakpoint or watchpoint was inserted, add a
message about possibly exhausted resources. */