2007-08-08 Michael Snyder <msnyder@access-company.com>

	* tui/tui-layout.c (tui_set_layout): Dead code, dead variable.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 998b54d5b10045004c773db1e4bc4b5f98d8b296..ecef0e80acde38f4b4d80cfd3ca454dd858f60df 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2007-08-08  Michael Snyder  <msnyder@access-company.com>
 
+       * tui/tui-layout.c (tui_set_layout): Dead code, dead variable.
+
        * top.c (command_line_input): Memory leak.
 
        * solib-svr4.c (open_symbol_file_object): Memory leak.

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 5a01736c25316437a20df8ae2de11450f16fa8c3..5995af0d2b021e7700ef013232f42d655a096962 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -139,7 +139,6 @@ tui_set_layout (enum tui_layout_type layout_type,
       enum tui_layout_type cur_layout = tui_current_layout (), new_layout = UNDEFINED_LAYOUT;
       int regs_populate = FALSE;
       CORE_ADDR addr = extract_display_start_addr ();
-      struct tui_win_info * new_win_with_focus = (struct tui_win_info *) NULL;
       struct tui_win_info * win_with_focus = tui_win_with_focus ();
       struct tui_layout_def * layout_def = tui_layout_def ();
 
@@ -234,10 +233,8 @@ tui_set_layout (enum tui_layout_type layout_type,
                      break;
                    }
                }
-             if (new_win_with_focus != (struct tui_win_info *) NULL)
-               tui_set_win_focus_to (new_win_with_focus);
              /*
-                ** Now update the window content
+              * Now update the window content.
               */
              if (!regs_populate &&
                  (new_layout == SRC_DATA_COMMAND ||
@@ -494,10 +491,10 @@ tui_set_layout_for_display_command (const char *layout_name)
            new_layout = prev_layout ();
          else
            status = TUI_FAILURE;
-         xfree (buf_ptr);
 
          tui_set_layout (new_layout, dpy_type);
        }
+      xfree (buf_ptr);
     }
   else
     status = TUI_FAILURE;