From 5ad71d67aef6b2885fcaf52b9151af6e28e9648a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 15 Jan 2022 15:35:35 -0700 Subject: [PATCH] Change inheritance of dprintf The dprintf breakpoint ops is mostly a copy of bpkt_breakpoint_ops, except it's written out explicitly -- and, importantly, there's nothing that bpkt_breakpoint_ops overrides that dprintf does not. This changes dprintf to simply inherit directly, and updates struct dprintf_breakpoint to reflect the change as well. --- gdb/breakpoint.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1258f3d503e..275860fee15 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -271,7 +271,7 @@ struct momentary_breakpoint : public base_breakpoint }; /* DPrintf breakpoints. */ -struct dprintf_breakpoint : public base_breakpoint +struct dprintf_breakpoint : public ordinary_breakpoint { }; @@ -14603,11 +14603,8 @@ initialize_breakpoint_ops (void) ops->decode_location = strace_marker_decode_location; ops = &dprintf_breakpoint_ops; - *ops = bkpt_base_breakpoint_ops; + *ops = bkpt_breakpoint_ops; ops->re_set = dprintf_re_set; - ops->resources_needed = bkpt_resources_needed; - ops->print_it = bkpt_print_it; - ops->print_mention = bkpt_print_mention; ops->print_recreate = dprintf_print_recreate; ops->after_condition_true = dprintf_after_condition_true; ops->breakpoint_hit = dprintf_breakpoint_hit; -- 2.30.2