From a48ddc0d6ab6ce60ecc7d20d704d3891b383dbf6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 16 Jan 2022 19:03:46 -0700 Subject: [PATCH] Remove breakpoint_ops from init_ada_exception_breakpoint 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 1ef955d142b..f1af28a696a 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -12761,7 +12761,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 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. */ } - 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 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); -- 2.30.2