espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 15:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove an unneeded NULL check

Browse Source 
show_source_or_disasm_and_command will either create or reset the
source window, so the final NULL check is not necessary.  This patch
removes it.

gdb/ChangeLog
2019-06-25  Tom Tromey  <tom@tromey.com>

	* tui/tui-layout.c (show_source_or_disasm_and_command): Remove
	NULL check.
This commit is contained in:
Tom Tromey
2019-06-16 14:14:10 -06:00
parent 63901aeccf
commit 6a0ee02c22
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (show_source_or_disasm_and_command): Remove
NULL check.
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-data.h (struct tui_data_window, struct tui_cmd_window):

44
gdb/tui/tui-layout.c
View File

@ -945,30 +945,28 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
tui_make_visible (&(*win_info_ptr)->generic);
tui_make_visible (base->execution_info);
}
if ((*win_info_ptr) != NULL)
{
base->m_has_locator = true;
tui_make_visible (locator);
tui_show_locator_content ();
tui_show_source_content (*win_info_ptr);
if (TUI_CMD_WIN == NULL)
{
tui_win_list[CMD_WIN] = make_command_window (cmd_height,
src_height);
tui_refresh_win (&TUI_CMD_WIN->generic);
}
else
{
init_gen_win_info (&TUI_CMD_WIN->generic,
TUI_CMD_WIN->generic.type,
TUI_CMD_WIN->generic.height,
TUI_CMD_WIN->generic.width,
TUI_CMD_WIN->generic.origin.x,
TUI_CMD_WIN->generic.origin.y);
TUI_CMD_WIN->can_highlight = FALSE;
tui_make_visible (&TUI_CMD_WIN->generic);
}
base->m_has_locator = true;
tui_make_visible (locator);
tui_show_locator_content ();
tui_show_source_content (*win_info_ptr);
if (TUI_CMD_WIN == NULL)
{
tui_win_list[CMD_WIN] = make_command_window (cmd_height,
src_height);
tui_refresh_win (&TUI_CMD_WIN->generic);
}
else
{
init_gen_win_info (&TUI_CMD_WIN->generic,
TUI_CMD_WIN->generic.type,
TUI_CMD_WIN->generic.height,
TUI_CMD_WIN->generic.width,
TUI_CMD_WIN->generic.origin.x,
TUI_CMD_WIN->generic.origin.y);
TUI_CMD_WIN->can_highlight = FALSE;
tui_make_visible (&TUI_CMD_WIN->generic);
}
tui_set_current_layout_to (layout_type);
}