* breakpoint.c (update_global_location_list): Remove nested

definition of `b'(-Wshadow).

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b385559630ecf5e21aa3ac0bbab59e6060adb171..a4698d8f780c2e13e7ae63c985b6865fe09e3eec 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-10  Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+       * breakpoint.c (update_global_location_list): Remove nested
+       definition of `b'(-Wshadow).
+
 2011-12-10  Andrey Smirnov  <andrew.smirnov@gmail.com>
 
        * breakpoint.c (insert_breakpoint_locations): Rename `error' to

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index e683c20daa011c8d5d40aa0d5aab4493b1e01ce3..0686587b4729db18c6c6a4708e396e87cd842a9d 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -10634,8 +10634,8 @@ update_global_location_list (int should_insert)
     {
       /* ALL_BP_LOCATIONS bp_location has LOC->OWNER always
         non-NULL.  */
-      struct breakpoint *b = loc->owner;
       struct bp_location **loc_first_p;
+      b = loc->owner;
 
       if (!should_be_inserted (loc)
          || !breakpoint_address_is_meaningful (b)