From patchwork Mon Jun 24 18:48:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33356 Received: (qmail 60744 invoked by alias); 24 Jun 2019 18:49:01 -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 60466 invoked by uid 89); 24 Jun 2019 18:48:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.5 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: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.182) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Jun 2019 18:48:55 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway32.websitewelcome.com (Postfix) with ESMTP id A7CD21F09C for ; Mon, 24 Jun 2019 13:48:54 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fU1OhYuY84FKpfU1OhpMGo; Mon, 24 Jun 2019 13:48:54 -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=X8Dc5sLeSrpSK1JdW2Of9x+SNDggpJ3Jb4hj+AAoonA=; b=UsttN4UE7j1YaE2XIH+GppSufd tTgzV4QCucAzDfCy4biZXqWphb71Kyg2cMy1JNKEZfoSt0XSO5UuhZ+OLJoLSB/CmYxwSndzarswb /ENcDrCr3aCuPTlNM/oF9vtP/; Received: from 75-166-12-78.hlrn.qwest.net ([75.166.12.78]:56746 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hfU1O-003qDK-Fg; Mon, 24 Jun 2019 13:48:54 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 60/66] Use bool for is_exec_point Date: Mon, 24 Jun 2019 12:48:35 -0600 Message-Id: <20190624184841.3492-11-tom@tromey.com> In-Reply-To: <20190624184841.3492-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> <20190624184841.3492-1-tom@tromey.com> This changes tui_source_element::is_exec_point to be a bool. I looked at also changing "has_break", but it turns out that this field is used inconsistently (sometimes as flags and sometimes as a bool), and so needs more invesstigation before it can be changed. 2019-06-23 Tom Tromey * tui/tui-winsource.c (tui_clear_source_content) (tui_source_window_base::set_is_exec_point_at): Update. * tui/tui-source.c (tui_set_source_content_nil): Update. * tui/tui-data.h (struct tui_source_element) : Now a bool. * tui/tui-data.c (init_content_element): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-data.c | 2 +- gdb/tui/tui-data.h | 2 +- gdb/tui/tui-source.c | 2 +- gdb/tui/tui-winsource.c | 12 ++++++------ 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 34d9272b413..429ce1c414c 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -368,7 +368,7 @@ init_content_element (struct tui_win_element *element, element->which_element.source.line = NULL; element->which_element.source.line_or_addr.loa = LOA_LINE; element->which_element.source.line_or_addr.u.line_no = 0; - element->which_element.source.is_exec_point = FALSE; + element->which_element.source.is_exec_point = false; element->which_element.source.has_break = FALSE; break; default: diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 2fe8c72af01..f0454c5d742 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -174,7 +174,7 @@ struct tui_source_element { char *line; struct tui_line_or_address line_or_addr; - int is_exec_point; + bool is_exec_point; int has_break; }; diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index e1448dbd961..54e4e1be903 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -244,7 +244,7 @@ tui_set_source_content_nil (struct tui_win_info *win_info, element->which_element.source.line_or_addr.loa = LOA_LINE; element->which_element.source.line_or_addr.u.line_no = 0; - element->which_element.source.is_exec_point = FALSE; + element->which_element.source.is_exec_point = false; element->which_element.source.has_break = FALSE; /* Set the contents of the line to blank. */ diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 204fee13be9..f30c3d67632 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -218,7 +218,7 @@ tui_clear_source_content (struct tui_win_info *win_info, struct tui_win_element *element = win_info->content[i]; element->which_element.source.has_break = FALSE; - element->which_element.source.is_exec_point = FALSE; + element->which_element.source.is_exec_point = false; } } } @@ -351,13 +351,13 @@ tui_source_window_base::do_scroll_horizontal (int num_to_scroll) void tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l) { - int changed = 0; + bool changed = false; int i; i = 0; while (i < content_size) { - int new_state; + bool new_state; struct tui_line_or_address content_loa = content[i]->which_element.source.line_or_addr; @@ -367,12 +367,12 @@ tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l) if (content_loa.loa == l.loa && ((l.loa == LOA_LINE && content_loa.u.line_no == l.u.line_no) || (content_loa.u.addr == l.u.addr))) - new_state = TRUE; + new_state = true; else - new_state = FALSE; + new_state = false; if (new_state != content[i]->which_element.source.is_exec_point) { - changed++; + changed = true; content[i]->which_element.source.is_exec_point = new_state; tui_show_source_line (this, i + 1); }