Change tui_alloc_source_buffer return type to void

tui_alloc_source_buffer can't actually fail, so change its return type
to void and update the callers.

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

	* tui/tui-winsource.h (tui_alloc_source_buffer): Change return
	type to void.
	* tui/tui-winsource.c (tui_alloc_source_buffer): Change return
	type to void.
	* tui/tui-source.c (tui_set_source_content): Update.
	* tui/tui-disasm.c (tui_set_disassem_content): Update.
This commit is contained in:
Tom Tromey 2019-06-16 17:49:41 -06:00
parent 152f3f4b33
commit 29d2c474f5
5 changed files with 81 additions and 78 deletions

View File

@ -1,3 +1,12 @@
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (tui_alloc_source_buffer): Change return
type to void.
* tui/tui-winsource.c (tui_alloc_source_buffer): Change return
type to void.
* tui/tui-source.c (tui_set_source_content): Update.
* tui/tui-disasm.c (tui_set_disassem_content): Update.
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (window_name_completer, tui_set_focus)

View File

@ -165,7 +165,6 @@ tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from)
enum tui_status
tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc)
{
enum tui_status ret = TUI_FAILURE;
int i;
int offset = TUI_DISASM_WIN->horizontal_offset;
int max_lines, line_width;
@ -180,9 +179,7 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc)
if (pc == 0)
return TUI_FAILURE;
ret = tui_alloc_source_buffer (TUI_DISASM_WIN);
if (ret != TUI_SUCCESS)
return ret;
tui_alloc_source_buffer (TUI_DISASM_WIN);
tui_source_window_base *base = TUI_DISASM_WIN;
base->gdbarch = gdbarch;

View File

@ -133,8 +133,8 @@ tui_set_source_content (struct symtab *s,
{
int line_width, nlines;
if ((ret = tui_alloc_source_buffer (TUI_SRC_WIN)) == TUI_SUCCESS)
{
ret = TUI_SUCCESS;
tui_alloc_source_buffer (TUI_SRC_WIN);
line_width = TUI_SRC_WIN->width - 1;
/* Take hilite (window border) into account, when
calculating the number of lines. */
@ -214,7 +214,6 @@ tui_set_source_content (struct symtab *s,
ret = TUI_SUCCESS;
}
}
}
return ret;
}

View File

@ -589,7 +589,7 @@ tui_update_exec_info (struct tui_win_info *win_info)
tui_show_exec_info_content (win_info);
}
enum tui_status
void
tui_alloc_source_buffer (struct tui_win_info *win_info)
{
int i, line_width, max_lines;
@ -608,8 +608,6 @@ tui_alloc_source_buffer (struct tui_win_info *win_info)
win_info->content[i]->which_element.source.line
= (char *) xmalloc (line_width);
}
return TUI_SUCCESS;
}

View File

@ -59,7 +59,7 @@ extern void tui_erase_exec_info_content (struct tui_win_info *);
extern void tui_clear_exec_info_content (struct tui_win_info *);
extern void tui_update_exec_info (struct tui_win_info *);
extern enum tui_status tui_alloc_source_buffer (struct tui_win_info *);
extern void tui_alloc_source_buffer (struct tui_win_info *);
extern int tui_line_is_displayed (int,
struct tui_win_info *,
int);