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

Change tui_set_layout to return void

Browse Source 
tui_set_layout can't meaningfully be called with UNDEFINED_LAYOUT; and
instead of trying to handle this case, simply assert and have the
function return void.  No caller was checking the return value anyway.

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-layout.h (tui/tui-layout): Return void.
	* tui/tui-layout.c (tui_set_layout): Return void.  Add assert.
This commit is contained in:
Tom Tromey
2019-06-30 20:34:57 -06:00
parent 4e1e56b981
commit b7fbad913e
3 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-layout.h (tui/tui-layout): Return void.
* tui/tui-layout.c (tui_set_layout): Return void. Add assert.
2019-07-17 Tom Tromey <tom@tromey.com> 2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (show_source_disasm_command, show_data): * tui/tui-layout.c (show_source_disasm_command, show_data):

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

@ -113,13 +113,11 @@ show_layout (enum tui_layout_type layout)
/* Function to set the layout to SRC_COMMAND, DISASSEM_COMMAND, /* Function to set the layout to SRC_COMMAND, DISASSEM_COMMAND,
SRC_DISASSEM_COMMAND, SRC_DATA_COMMAND, or DISASSEM_DATA_COMMAND. */ SRC_DISASSEM_COMMAND, SRC_DATA_COMMAND, or DISASSEM_DATA_COMMAND. */
enum tui_status void
tui_set_layout (enum tui_layout_type layout_type) tui_set_layout (enum tui_layout_type layout_type)
{ {
enum tui_status status = TUI_SUCCESS; gdb_assert (layout_type != UNDEFINED_LAYOUT);
if (layout_type != UNDEFINED_LAYOUT)
{
enum tui_layout_type cur_layout = tui_current_layout (); enum tui_layout_type cur_layout = tui_current_layout ();
struct gdbarch *gdbarch; struct gdbarch *gdbarch;
CORE_ADDR addr; CORE_ADDR addr;
@ -206,11 +204,6 @@ tui_set_layout (enum tui_layout_type layout_type)
|| new_layout == DISASSEM_DATA_COMMAND) || new_layout == DISASSEM_DATA_COMMAND)
tui_show_registers (TUI_DATA_WIN->current_group); tui_show_registers (TUI_DATA_WIN->current_group);
} }
}
else
status = TUI_FAILURE;
return status;
} }
/* Add the specified window to the layout in a logical way. This /* Add the specified window to the layout in a logical way. This

2
gdb/tui/tui-layout.h
View File

@ -30,6 +30,6 @@ extern int tui_default_win_height (enum tui_win_type,
enum tui_layout_type); enum tui_layout_type);
extern int tui_default_win_viewport_height (enum tui_win_type, extern int tui_default_win_viewport_height (enum tui_win_type,
enum tui_layout_type); enum tui_layout_type);
extern enum tui_status tui_set_layout (enum tui_layout_type); extern void tui_set_layout (enum tui_layout_type);
#endif /* TUI_TUI_LAYOUT_H */ #endif /* TUI_TUI_LAYOUT_H */