diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2015-02-17 08:06:10 -0500 |
|---|---|---|
| committer | Patrick Palka <patrick@parcs.ath.cx> | 2015-02-17 08:06:10 -0500 |
| commit | 69efdff130b843838e791065335b44d5f91f7075 (patch) | |
| tree | ac5ed0b08967db2b7215c141143446fd866df64f | |
| parent | f8e5e23e3dc46042fcf5fad6013e6fa8db13ec43 (diff) | |
| download | gdb-69efdff130b843838e791065335b44d5f91f7075.zip gdb-69efdff130b843838e791065335b44d5f91f7075.tar.gz gdb-69efdff130b843838e791065335b44d5f91f7075.tar.bz2 | |
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.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/tui/tui-io.c | 17 |
2 files changed, 7 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e576000..bf98df1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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 diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 199f331..12bd29f 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -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; |