From patchwork Thu Jan 8 04:04:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 4562 Received: (qmail 23764 invoked by alias); 8 Jan 2015 04:05:40 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 23733 invoked by uid 89); 8 Jan 2015 04:05:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-qa0-f47.google.com Received: from mail-qa0-f47.google.com (HELO mail-qa0-f47.google.com) (209.85.216.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 08 Jan 2015 04:05:10 +0000 Received: by mail-qa0-f47.google.com with SMTP id f12so786711qad.6 for ; Wed, 07 Jan 2015 20:05:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FEYzBO1p9t/pvXJPlSSvNNNcq8zAjxJJ1c2HS+vrUDQ=; b=mSdY5UCUIoQmsd9Q6R6f7OCvmpalfLxppq3uQXEflx0fz7DDByyvda4v3VvOf3YNJK RqTKosSY+U/Vx9HDGb1rFy9K90l6yFcVnv71OxtoU09iQaVvCFah5EaSrDtikPDc718/ XZ6A8mAxnE7V03ThCZuf5R6N8USVJESsgFLXvYhxjuvP8fCmgJ1S9KbInh+7EK4UslM4 xEupA4W5Vg0iw65STsjBj/KNxeNxhhEeKudGLHjjrJ5SOxE16vRv/sxS5+sPYuBBepj1 Ltx/3NaD9/RBDhoReUixjXM6Tv87K1lDlb/oRfswPET5Pxu+IomIZlmY81XG8+URggBP W5mQ== X-Gm-Message-State: ALoCoQmNBf0F9OIphZZoxS3gBAnhenh8Qw5wgEJObFlvLT9gGHGC2hjDqELiikYAqU5XkfhgXReH X-Received: by 10.140.108.9 with SMTP id i9mr10530112qgf.73.1420689907273; Wed, 07 Jan 2015 20:05:07 -0800 (PST) Received: from localhost.localdomain (ool-4353ac94.dyn.optonline.net. [67.83.172.148]) by mx.google.com with ESMTPSA id k2sm3039232qay.24.2015.01.07.20.05.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jan 2015 20:05:06 -0800 (PST) From: Patrick Palka To: gdb-patches@sourceware.org Cc: Patrick Palka Subject: [PATCH 1/3] Remove superfluous function key_is_command_char() Date: Wed, 7 Jan 2015 23:04:43 -0500 Message-Id: <1420689885-31156-1-git-send-email-patrick@parcs.ath.cx> 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. --- gdb/tui/tui-io.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 233e7a6..b0e6c75 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) \ @@ -682,10 +671,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;