From 6658b1bf6c2d8d9383826bdfd4068b77d38b3b94 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 23 Jun 2019 08:27:55 -0600 Subject: [PATCH] Fix "auxiliary" typo The TUI has a function called tui_win_is_auxillary, but the word should actually be spelled "auxiliary". This fixes the typo. gdb/ChangeLog 2019-06-25 Tom Tromey * tui/tui-wingeneral.c (tui_gen_win_info::make_visible): Update. * tui/tui-win.c (make_invisible_and_set_new_height): Update. * tui/tui-layout.c (init_and_make_win): Update. * tui/tui.h (enum tui_win_type): Update. * tui/tui-data.h (tui_win_is_auxiliary): Rename from tui_win_is_auxillary. * tui/tui-data.c (tui_win_is_auxiliary): Rename from tui_win_is_auxillary. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-data.c | 2 +- gdb/tui/tui-data.h | 2 +- gdb/tui/tui-layout.c | 2 +- gdb/tui/tui-win.c | 4 ++-- gdb/tui/tui-wingeneral.c | 2 +- gdb/tui/tui.h | 2 +- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d6848f04553..8519e46625a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2019-06-25 Tom Tromey + + * tui/tui-wingeneral.c (tui_gen_win_info::make_visible): Update. + * tui/tui-win.c (make_invisible_and_set_new_height): Update. + * tui/tui-layout.c (init_and_make_win): Update. + * tui/tui.h (enum tui_win_type): Update. + * tui/tui-data.h (tui_win_is_auxiliary): Rename from + tui_win_is_auxillary. + * tui/tui-data.c (tui_win_is_auxiliary): Rename from + tui_win_is_auxillary. + 2019-06-25 Tom Tromey * tui/tui-wingeneral.c (tui_data_window::refresh_window): Update. diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 7cf7d7f2216..881e5d592a6 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -63,7 +63,7 @@ static void free_content_elements (tui_win_content, **********************************/ int -tui_win_is_auxillary (enum tui_win_type win_type) +tui_win_is_auxiliary (enum tui_win_type win_type) { return (win_type > MAX_MAJOR_WINDOWS); } diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 2e13f306e76..8ec5ddfc0ab 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -538,7 +538,7 @@ protected: void do_make_visible_with_new_height () override; }; -extern int tui_win_is_auxillary (enum tui_win_type win_type); +extern int tui_win_is_auxiliary (enum tui_win_type win_type); /* Global Data. */ diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 61be48b877f..9fffba779a9 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -816,7 +816,7 @@ init_and_make_win (tui_gen_win_info *win_info, break; default: - gdb_assert (tui_win_is_auxillary (win_type)); + gdb_assert (tui_win_is_auxiliary (win_type)); win_info = new tui_gen_win_info (win_type); break; } diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 40b962739ce..dac3996ce5b 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1274,7 +1274,7 @@ tui_data_window::set_new_height (int height) } } -/* Function make the target window (and auxillary windows associated +/* Function make the target window (and auxiliary windows associated with the targer) invisible, and set the new height and location. */ static void @@ -1290,7 +1290,7 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info, if (win_info != TUI_CMD_WIN) win_info->viewport_height--; - /* Now deal with the auxillary windows associated with win_info. */ + /* Now deal with the auxiliary windows associated with win_info. */ win_info->set_new_height (height); } diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 8f64e73e284..13063ae9356 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -172,7 +172,7 @@ tui_gen_win_info::make_visible (bool visible) { if (!is_visible) { - tui_make_window (this, (tui_win_is_auxillary (type) + tui_make_window (this, (tui_win_is_auxiliary (type) ? DONT_BOX_WINDOW : BOX_WINDOW)); is_visible = true; } diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h index b3321de9fdc..69ad60c98bf 100644 --- a/gdb/tui/tui.h +++ b/gdb/tui/tui.h @@ -42,7 +42,7 @@ enum tui_win_type CMD_WIN, /* This must ALWAYS be AFTER the major windows last. */ MAX_MAJOR_WINDOWS, - /* Auxillary windows. */ + /* Auxiliary windows. */ LOCATOR_WIN, EXEC_INFO_WIN, DATA_ITEM_WIN -- 2.30.2