From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 8ED613857404; Fri, 29 Apr 2022 22:24:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8ED613857404 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove breakpoint_ops from init_ada_exception_breakpoint X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 8d89123dc22188d5560f452bc52baba50d154a91 X-Git-Newrev: a48ddc0d6ab6ce60ecc7d20d704d3891b383dbf6 Message-Id: <20220429222416.8ED613857404@sourceware.org> Date: Fri, 29 Apr 2022 22:24:16 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2022 22:24:16 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Da48ddc0d6ab6= ce60ecc7d20d704d3891b383dbf6 commit a48ddc0d6ab6ce60ecc7d20d704d3891b383dbf6 Author: Tom Tromey Date: Sun Jan 16 19:03:46 2022 -0700 Remove breakpoint_ops from init_ada_exception_breakpoint =20 init_ada_exception_breakpoint is only ever passed a single breakpoint_ops structure, so remove the parameter. Diff: --- 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 1ef955d142b..f1af28a696a 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -12761,7 +12761,6 @@ create_ada_exception_catchpoint (struct gdbarch *gd= barch, =20 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 =3D excep_string; create_excep_cond_exprs (c.get (), ex_kind); diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ecea7024624..b29b021662d 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10631,7 +10631,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) @@ -10654,7 +10653,8 @@ init_ada_exception_breakpoint (struct breakpoint *b, enough for now, though. */ } =20 - init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, ops); + init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, + &vtable_breakpoint_ops); =20 b->enable_state =3D enabled ? bp_enabled : bp_disabled; b->disposition =3D tempflag ? disp_del : disp_donttouch; diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 4e52656dc7c..10e7410220d 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1518,7 +1518,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);