OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove superfluous function key_is_command_char() 

The function key_is_command_char() is simply a predicate that determines
whether the function tui_dispatch_ctrl_char() will do anything useful.
Since tui_dispatch_ctrl_char() performs the same checks as
key_is_command_char() it is unnecessary to keep key_is_command_char()
around.  This patch removes this useless function and instead
unconditionally calls tui_dispatch_ctrl_char() inside its only caller,
tui_getc().

gdb/ChangeLog:

	* tui/tui-io.c (tui_getc): Don't call key_is_command_char.
	(key_is_command_char): Delete.
This commit is contained in:
Patrick Palka 2015-02-17 08:06:10 -05:00
parent f8e5e23e3d
commit 69efdff130
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2015-02-17 Patrick Palka <patrick@parcs.ath.cx>
* tui/tui-io.c (tui_getc): Don't call key_is_command_char.
(key_is_command_char): Delete.
2015-02-17 Pedro Alves <palves@redhat.com>
* tui/tui.c (tui_enable): Resize windows before anything

17
gdb/tui/tui-io.c
View File

@ -63,17 +63,6 @@ key_is_backspace (int ch)
return (ch == 8);
}
int
key_is_command_char (int ch)
{
return ((ch == KEY_NPAGE) || (ch == KEY_PPAGE)
|| (ch == KEY_LEFT) || (ch == KEY_RIGHT)
|| (ch == KEY_UP) || (ch == KEY_DOWN)
|| (ch == KEY_SF) || (ch == KEY_SR)
|| (ch == (int)'\f')
|| key_is_start_sequence (ch));
}
/* Use definition from readline 4.3. */
#undef CTRL_CHAR
#define CTRL_CHAR(c) \
@ -640,10 +629,8 @@ tui_getc (FILE *fp)
}
}
if (key_is_command_char (ch))
{ /* Handle prev/next/up/down here. */
ch = tui_dispatch_ctrl_char (ch);
}
/* Handle prev/next/up/down here. */
ch = tui_dispatch_ctrl_char (ch);
if (ch == '\n' || ch == '\r' || ch == '\f')
TUI_CMD_WIN->detail.command_info.curch = 0;