From 3d34df0aa78ad01e5104ad1294364ef754a37cfa Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 30 Dec 2019 09:11:32 -0700 Subject: [PATCH] Make some TUI globals "static" This changes a few TUI globals to be "static". Tested by rebuilding. gdb/ChangeLog 2019-12-30 Tom Tromey * tui/tui-win.c (tui_border_mode_translate) (tui_border_kind_translate_vline, tui_border_kind_translate_hline) (tui_border_kind_translate_ulcorner) (tui_border_kind_translate_urcorner) (tui_border_kind_translate_llcorner) (tui_border_kind_translate_lrcorner, tui_active_border_mode) (tui_border_mode, tui_border_kind): Now static. Change-Id: Ibb49a0df195dfe780a5ba1f90e9125ab5f6b7ce1 --- gdb/ChangeLog | 10 ++++++++++ gdb/tui/tui-win.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ccf45eb21..3a67dd0f7d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2019-12-30 Tom Tromey + + * tui/tui-win.c (tui_border_mode_translate) + (tui_border_kind_translate_vline, tui_border_kind_translate_hline) + (tui_border_kind_translate_ulcorner) + (tui_border_kind_translate_urcorner) + (tui_border_kind_translate_llcorner) + (tui_border_kind_translate_lrcorner, tui_active_border_mode) + (tui_border_mode, tui_border_kind): Now static. + 2019-12-30 Tom Tromey * tui/tui-interp.c (tui_start_enabled): Now bool. diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 959b0cdd76..48df5354bf 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -119,7 +119,7 @@ struct tui_translate /* Translation table for border-mode variables. The list of values must be terminated by a NULL. After the NULL value, an entry defines the default. */ -struct tui_translate tui_border_mode_translate[] = { +static struct tui_translate tui_border_mode_translate[] = { { "normal", A_NORMAL }, { "standout", A_STANDOUT }, { "reverse", A_REVERSE }, @@ -135,7 +135,7 @@ struct tui_translate tui_border_mode_translate[] = { character (see wborder, border curses operations). -1 is used to indicate the ACS because ACS characters are determined at run time by curses (depends on terminal). */ -struct tui_translate tui_border_kind_translate_vline[] = { +static struct tui_translate tui_border_kind_translate_vline[] = { { "space", ' ' }, { "ascii", '|' }, { "acs", -1 }, @@ -143,7 +143,7 @@ struct tui_translate tui_border_kind_translate_vline[] = { { "ascii", '|' } }; -struct tui_translate tui_border_kind_translate_hline[] = { +static struct tui_translate tui_border_kind_translate_hline[] = { { "space", ' ' }, { "ascii", '-' }, { "acs", -1 }, @@ -151,7 +151,7 @@ struct tui_translate tui_border_kind_translate_hline[] = { { "ascii", '-' } }; -struct tui_translate tui_border_kind_translate_ulcorner[] = { +static struct tui_translate tui_border_kind_translate_ulcorner[] = { { "space", ' ' }, { "ascii", '+' }, { "acs", -1 }, @@ -159,7 +159,7 @@ struct tui_translate tui_border_kind_translate_ulcorner[] = { { "ascii", '+' } }; -struct tui_translate tui_border_kind_translate_urcorner[] = { +static struct tui_translate tui_border_kind_translate_urcorner[] = { { "space", ' ' }, { "ascii", '+' }, { "acs", -1 }, @@ -167,7 +167,7 @@ struct tui_translate tui_border_kind_translate_urcorner[] = { { "ascii", '+' } }; -struct tui_translate tui_border_kind_translate_llcorner[] = { +static struct tui_translate tui_border_kind_translate_llcorner[] = { { "space", ' ' }, { "ascii", '+' }, { "acs", -1 }, @@ -175,7 +175,7 @@ struct tui_translate tui_border_kind_translate_llcorner[] = { { "ascii", '+' } }; -struct tui_translate tui_border_kind_translate_lrcorner[] = { +static struct tui_translate tui_border_kind_translate_lrcorner[] = { { "space", ' ' }, { "ascii", '+' }, { "acs", -1 }, @@ -185,7 +185,7 @@ struct tui_translate tui_border_kind_translate_lrcorner[] = { /* Tui configuration variables controlled with set/show command. */ -const char *tui_active_border_mode = "bold-standout"; +static const char *tui_active_border_mode = "bold-standout"; static void show_tui_active_border_mode (struct ui_file *file, int from_tty, @@ -197,7 +197,7 @@ The attribute mode to use for the active TUI window border is \"%s\".\n"), value); } -const char *tui_border_mode = "normal"; +static const char *tui_border_mode = "normal"; static void show_tui_border_mode (struct ui_file *file, int from_tty, @@ -209,7 +209,7 @@ The attribute mode to use for the TUI window borders is \"%s\".\n"), value); } -const char *tui_border_kind = "acs"; +static const char *tui_border_kind = "acs"; static void show_tui_border_kind (struct ui_file *file, int from_tty, -- 2.34.1