From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id 4EC53385782A for ; Tue, 18 Jan 2022 19:40:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4EC53385782A 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id C03B110048A1D for ; Tue, 18 Jan 2022 19:40:24 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 9uLAnus87wm8i9uLAntQgB; Tue, 18 Jan 2022 19:40:24 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=DpSTREz+ c=1 sm=1 tr=0 ts=61e717a8 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=BZ_8h8brzvYO3SN23F8A: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=XKSFx3zTRhZUEnGWy0hPa3SvX4+3WfyWCZgMKvLFjCA=; b=RkrqOUrfUrFDj28wb/iOC2QDkU uijbmzsjPwrNriVAaWLUltFtCjUouy8bjCs7DScRxitRkHJshZ1BOQbouuN42pCc3Jx8GmzSNqDUg oIxVSlk62PGX110BC+J8emI65; Received: from 75-166-134-30.hlrn.qwest.net ([75.166.134.30]:40588 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 1n9uL9-0015df-Fl; Tue, 18 Jan 2022 12:40:23 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 36/36] Remove create_breakpoints_sal_default Date: Tue, 18 Jan 2022 12:40:07 -0700 Message-Id: <20220118194007.2853108-37-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: 1n9uL9-0015df-Fl X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-134-30.hlrn.qwest.net (prentzel.Home) [75.166.134.30]:40588 X-Source-Auth: tom+tromey.com X-Email-Count: 37 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:26 -0000 create_breakpoints_sal_default is just a simple wrapper, so remove it. --- gdb/breakpoint.c | 49 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 587344d6d74..b5325f4a6e9 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -94,15 +94,15 @@ static void struct linespec_result *canonical, enum bptype type_wanted); -static void create_breakpoints_sal_default (struct gdbarch *, - struct linespec_result *, - gdb::unique_xmalloc_ptr, - gdb::unique_xmalloc_ptr, - enum bptype, - enum bpdisp, int, int, - int, - const struct breakpoint_ops *, - int, int, int, unsigned); +static void create_breakpoints_sal (struct gdbarch *, + struct linespec_result *, + gdb::unique_xmalloc_ptr, + gdb::unique_xmalloc_ptr, + enum bptype, + enum bpdisp, int, int, + int, + const struct breakpoint_ops *, + int, int, int, unsigned); static std::vector decode_location_default (struct breakpoint *b, struct event_location *location, @@ -244,21 +244,21 @@ static void tracepoint_probe_create_sals_from_location const struct breakpoint_ops base_breakpoint_ops = { create_sals_from_location_default, - create_breakpoints_sal_default, + create_breakpoints_sal, }; /* Breakpoints set on probes. */ static const struct breakpoint_ops bkpt_probe_breakpoint_ops = { bkpt_probe_create_sals_from_location, - create_breakpoints_sal_default, + create_breakpoints_sal, }; /* Tracepoints set on probes. */ static const struct breakpoint_ops tracepoint_probe_breakpoint_ops = { tracepoint_probe_create_sals_from_location, - create_breakpoints_sal_default, + create_breakpoints_sal, }; /* The structure to be used in regular breakpoints. */ @@ -12912,31 +12912,6 @@ create_sals_from_location_default (struct event_location *location, parse_breakpoint_sals (location, canonical); } -/* Call create_breakpoints_sal for the given arguments. This is the default - function for the `create_breakpoints_sal' method of - breakpoint_ops. */ - -static void -create_breakpoints_sal_default (struct gdbarch *gdbarch, - struct linespec_result *canonical, - gdb::unique_xmalloc_ptr cond_string, - gdb::unique_xmalloc_ptr extra_string, - enum bptype type_wanted, - enum bpdisp disposition, - int thread, - int task, int ignore_count, - const struct breakpoint_ops *ops, - int from_tty, int enabled, - int internal, unsigned flags) -{ - create_breakpoints_sal (gdbarch, canonical, - std::move (cond_string), - std::move (extra_string), - type_wanted, disposition, - thread, task, ignore_count, ops, from_tty, - enabled, internal, flags); -} - /* Decode the line represented by S by calling decode_line_full. This is the default function for the `decode_location' method of breakpoint_ops. */ -- 2.31.1