From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 9A8DF3857813 for ; Tue, 18 Jan 2022 19:40:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9A8DF3857813 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 173CB1003B6C8 for ; Tue, 18 Jan 2022 19:40:21 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 9uL6nA7h7nAlU9uL6n1WSX; Tue, 18 Jan 2022 19:40:21 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=QIOt+iHL c=1 sm=1 tr=0 ts=61e717a5 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=DghFqjY3_ZEA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=qV7A5yZM8fyohov5zaQA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=7irs23ktpaq7PTM3N5C8XTqOFqCXAfObdI47eKT4Tes=; b=jzpphtlTfsolhsIdVlXtCX/ccP Hu9iAkoGZNQ905wTSP4ueHOC7CTp1dzOODVIqPHsLZo2LEVzz/z1iuEs8SEWtIn56TSaKWCVIYdo3 bPZGCq/LElpAqI8SiTXTMegLv; Received: from 75-166-134-30.hlrn.qwest.net ([75.166.134.30]:40586 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n9uL5-0015YU-Nd; Tue, 18 Jan 2022 12:40:19 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 29/36] Remove breakpoint_ops from init_ada_exception_breakpoint Date: Tue, 18 Jan 2022 12:40:00 -0700 Message-Id: <20220118194007.2853108-30-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220118194007.2853108-1-tom@tromey.com> References: <20220118194007.2853108-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.134.30 X-Source-L: No X-Exim-ID: 1n9uL5-0015YU-Nd X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-134-30.hlrn.qwest.net (prentzel.Home) [75.166.134.30]:40586 X-Source-Auth: tom+tromey.com X-Email-Count: 30 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 19:40:22 -0000 init_ada_exception_breakpoint is only ever passed a single breakpoint_ops structure, so remove the parameter. --- gdb/ada-lang.c | 1 - gdb/breakpoint.c | 4 ++-- gdb/breakpoint.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 40e369a4626..5b98d824bb4 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -12283,7 +12283,6 @@ create_ada_exception_catchpoint (struct gdbarch *gdbarch, std::unique_ptr c (new ada_catchpoint (ex_kind)); init_ada_exception_breakpoint (c.get (), gdbarch, sal, addr_string.c_str (), - &vtable_breakpoint_ops, tempflag, disabled, from_tty); c->excep_string = excep_string; create_excep_cond_exprs (c.get (), ex_kind); diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 117599e2ecc..4885c72d8c0 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10643,7 +10643,6 @@ init_ada_exception_breakpoint (struct breakpoint *b, struct gdbarch *gdbarch, struct symtab_and_line sal, const char *addr_string, - const struct breakpoint_ops *ops, int tempflag, int enabled, int from_tty) @@ -10666,7 +10665,8 @@ init_ada_exception_breakpoint (struct breakpoint *b, enough for now, though. */ } - init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, ops); + init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, + &vtable_breakpoint_ops); b->enable_state = enabled ? bp_enabled : bp_disabled; b->disposition = tempflag ? disp_del : disp_donttouch; diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index e362cd454ec..a17d0080603 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1500,7 +1500,6 @@ extern void struct gdbarch *gdbarch, struct symtab_and_line sal, const char *addr_string, - const struct breakpoint_ops *ops, int tempflag, int enabled, int from_tty); -- 2.31.1