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.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 1ef955d142ba111cdfb30da93d22adb1086e7f72..f1af28a696ab7e6c3c0c63111b7d3012447272f3 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -12761,7 +12761,6 @@ create_ada_exception_catchpoint (struct gdbarch *gdbarch,
 
   std::unique_ptr<ada_catchpoint> 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 ecea702462452df0f1eb19ca0e6c96758a93f36e..b29b021662d72ea0080f1ae9ecd9a089b19d14c9 100644 (file)
--- 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 4e52656dc7c9457d25bbf65e33bbece5963873ca..10e7410220d19abdcbcaed6276cc1477cbac7243 100644 (file)
--- 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);