From patchwork Wed Aug 14 16:21:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34098 Received: (qmail 72172 invoked by alias); 14 Aug 2019 16:21:45 -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 71780 invoked by uid 89); 14 Aug 2019 16:21:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.50.185) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 14 Aug 2019 16:21:40 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway23.websitewelcome.com (Postfix) with ESMTP id BA9E239FC for ; Wed, 14 Aug 2019 11:21:38 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id xw1qhlmAwiQerxw1qh7rO4; Wed, 14 Aug 2019 11:21:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=MiTzqS8+KjHL25dJpMcpsCWCAGaSh0MMKyMxyetzZgM=; b=f8D2zOTvW3YUa5oyJRWrY7AKLl +tRk017yfkDMspc7FekJRbJsy9QxOdAvAMBShmHnjabrBqsO95uGYkAMqMxyXCjpJnJE8kG9qlfo9 FMOe+ewc23LQxpzlFCjMYbSGA; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:38600 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hxw1q-002Cwq-GW; Wed, 14 Aug 2019 11:21:38 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 10/15] Remove tui_clear_source_content Date: Wed, 14 Aug 2019 10:21:27 -0600 Message-Id: <20190814162132.31424-11-tom@tromey.com> In-Reply-To: <20190814162132.31424-1-tom@tromey.com> References: <20190814162132.31424-1-tom@tromey.com> tui_clear_source_content is not needed. Instead, the callers can call erase_source_content, which is also changed to clear the content vector. 2019-08-14 Tom Tromey * tui/tui-winsource.h (tui_clear_source_content): Don't declare. * tui/tui-winsource.c (tui_update_source_window_as_is): Don't call tui_clear_source_content. (tui_clear_source_content): Remove. (tui_source_window_base::do_erase_source_content): Hoist call to content.clear(). * tui/tui-stack.c (tui_show_frame_info): Don't call tui_clear_source_content. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-stack.c | 2 +- gdb/tui/tui-winsource.c | 25 +++---------------------- gdb/tui/tui-winsource.h | 1 - 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index 09ee87f4027..f61aa526004 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -411,7 +411,7 @@ tui_show_frame_info (struct frame_info *fi) tui_show_locator_content (); for (struct tui_source_window_base *win_info : tui_source_windows ()) { - tui_clear_source_content (win_info); + win_info->erase_source_content (); win_info->update_exec_info (); } diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index d955efcd575..95a2ac27094 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -98,7 +98,7 @@ tui_update_source_window_as_is (struct tui_source_window_base *win_info, ret = tui_set_disassem_content (win_info, gdbarch, line_or_addr.u.addr); if (ret == TUI_FAILURE) - tui_clear_source_content (win_info); + win_info->erase_source_content (); else { tui_update_breakpoint_info (win_info, nullptr, false); @@ -153,7 +153,7 @@ tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr) else { for (struct tui_source_window_base *win_info : tui_source_windows ()) - tui_clear_source_content (win_info); + win_info->erase_source_content (); } } @@ -191,31 +191,13 @@ tui_update_source_windows_with_line (struct symtab *s, int line) } } -void -tui_clear_source_content (struct tui_source_window_base *win_info) -{ - if (win_info != NULL) - { - int i; - - win_info->erase_source_content (); - for (i = 0; i < win_info->content.size (); i++) - { - struct tui_source_element *element = &win_info->content[i]; - - element->break_mode = 0; - element->is_exec_point = false; - } - } -} - - void tui_source_window_base::do_erase_source_content (const char *str) { int x_pos; int half_width = (width - 2) / 2; + content.clear (); if (handle != NULL) { werase (handle); @@ -230,7 +212,6 @@ tui_source_window_base::do_erase_source_content (const char *str) x_pos, (char *) str); - content.clear (); refresh_window (); werase (execution_info->handle); diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 60031d3bdb0..b5528011f5a 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -185,7 +185,6 @@ extern void tui_update_source_window_as_is (struct tui_source_window_base *, extern void tui_update_source_windows_with_addr (struct gdbarch *, CORE_ADDR); extern void tui_update_source_windows_with_line (struct symtab *, int); -extern void tui_clear_source_content (struct tui_source_window_base *); /* Constant definitions. */ #define SCROLL_THRESHOLD 2 /* Threshold for lazy scroll. */