Browse Source

gdb/tui: Define tui window names once.

Don't duplicate the window names inside the completion function.
Instead make use of the existing defines, and the tui_win_name function
to obtain the window names.

gdb/ChangeLog:

	* tui/tui-win.c (focus_completer): Don't duplicate the tui window
	names in this function.
users/ARM/embedded-binutils-2_26-branch
Andrew Burgess 11 years ago
parent
commit
150375dc7a
  1. 5
      gdb/ChangeLog
  2. 27
      gdb/tui/tui-win.c

5
gdb/ChangeLog

@ -1,3 +1,8 @@
2015-07-10 Andrew Burgess <andrew.burgess@embecosm.com>
* tui/tui-win.c (focus_completer): Don't duplicate the tui window
names in this function.
2015-07-10 Andrew Burgess <andrew.burgess@embecosm.com>
* tui/tui-data.h (SRC_NAME): Convert to lower case.

27
gdb/tui/tui-win.c

@ -374,26 +374,9 @@ focus_completer (struct cmd_list_element *ignore,
|| !tui_win_list[win_type]->generic.is_visible)
continue;
switch (win_type)
{
case SRC_WIN:
completion_name = "src";
break;
case DISASSEM_WIN:
completion_name = "asm";
break;
case DATA_WIN:
completion_name = "regs";
break;
case CMD_WIN:
completion_name = "cmd";
break;
default:
break;
}
if (completion_name != NULL)
VEC_safe_push (const_char_ptr, completion_name_vec, completion_name);
completion_name = tui_win_name (&tui_win_list [win_type]->generic);
gdb_assert (completion_name != NULL);
VEC_safe_push (const_char_ptr, completion_name_vec, completion_name);
}
/* If no windows are considered visible then the TUI has not yet been
@ -402,8 +385,8 @@ focus_completer (struct cmd_list_element *ignore,
default layout to SRC_COMMAND. */
if (VEC_length (const_char_ptr, completion_name_vec) == 0)
{
VEC_safe_push (const_char_ptr, completion_name_vec, "src");
VEC_safe_push (const_char_ptr, completion_name_vec, "cmd");
VEC_safe_push (const_char_ptr, completion_name_vec, SRC_NAME);
VEC_safe_push (const_char_ptr, completion_name_vec, CMD_NAME);
}
VEC_safe_push (const_char_ptr, completion_name_vec, "next");

Loading…
Cancel
Save