From 16cb7910b946bad4b5f4aa69925361004c4e412f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 5 Jul 2019 12:35:08 -0600 Subject: [PATCH] Make tui_default_win_height static tui_default_win_height is only used in tui-layout.c, so make it static. gdb/ChangeLog 2019-08-13 Tom Tromey * tui/tui-layout.h (tui_default_win_height): Don't declare. * tui/tui-layout.c (tui_default_win_height): Now static. --- gdb/ChangeLog | 5 +++++ gdb/tui/tui-layout.c | 2 +- gdb/tui/tui-layout.h | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ea3c077..8e70be6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-08-13 Tom Tromey + * tui/tui-layout.h (tui_default_win_height): Don't declare. + * tui/tui-layout.c (tui_default_win_height): Now static. + +2019-08-13 Tom Tromey + * tui/tui-layout.c (show_layout): Unify all layout cases into a single switch. (show_source_disasm_command, show_source_or_disasm_and_command): diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 91db384..f4f834dc 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -254,7 +254,7 @@ tui_add_win_to_layout (enum tui_win_type type) /* Answer the height of a window. If it hasn't been created yet, answer what the height of a window would be based upon its type and the layout. */ -int +static int tui_default_win_height (enum tui_win_type type, enum tui_layout_type layout) { diff --git a/gdb/tui/tui-layout.h b/gdb/tui/tui-layout.h index 5f19933..a7e1e90 100644 --- a/gdb/tui/tui-layout.h +++ b/gdb/tui/tui-layout.h @@ -26,8 +26,6 @@ #include "tui/tui-data.h" extern void tui_add_win_to_layout (enum tui_win_type); -extern int tui_default_win_height (enum tui_win_type, - enum tui_layout_type); extern int tui_default_win_viewport_height (enum tui_win_type, enum tui_layout_type); extern void tui_set_layout (enum tui_layout_type); -- 2.7.4