From ae3bd4315d0b1746d43b132decf3a14f91775061 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:31:01 -0700 Subject: [PATCH] Add target_ops argument to to_terminal_save_ours 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. (target_terminal_save_ours): Add argument. * target.c (debug_to_terminal_save_ours): Add argument. (update_current_target): Update. * inflow.c (terminal_save_ours): Add 'self' argument. * inferior.h (terminal_save_ours): Add 'self' argument. --- gdb/ChangeLog | 10 ++++++++++ gdb/inferior.h | 2 +- gdb/inflow.c | 2 +- gdb/target.c | 8 ++++---- gdb/target.h | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f7a5d307b5d..6447a3945a3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2014-02-19 Tom Tromey + + * target.h (struct target_ops) : Add + argument. + (target_terminal_save_ours): Add argument. + * target.c (debug_to_terminal_save_ours): Add argument. + (update_current_target): Update. + * inflow.c (terminal_save_ours): Add 'self' argument. + * inferior.h (terminal_save_ours): Add 'self' argument. + 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. diff --git a/gdb/inferior.h b/gdb/inferior.h index c577fb4b86d..938933f6c2b 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -125,7 +125,7 @@ extern int disable_randomization; extern void generic_mourn_inferior (void); -extern void terminal_save_ours (void); +extern void terminal_save_ours (struct target_ops *self); extern void terminal_ours (struct target_ops *self); diff --git a/gdb/inflow.c b/gdb/inflow.c index 087cc604022..fc5a716a38a 100644 --- a/gdb/inflow.c +++ b/gdb/inflow.c @@ -245,7 +245,7 @@ terminal_init_inferior_with_pgrp (int pgrp) and gdb must be able to restore it correctly. */ void -terminal_save_ours (void) +terminal_save_ours (struct target_ops *self) { if (gdb_has_a_terminal ()) { diff --git a/gdb/target.c b/gdb/target.c index ddb7c635028..9a0dfc3799e 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -138,7 +138,7 @@ static void debug_to_terminal_inferior (struct target_ops *self); static void debug_to_terminal_ours_for_output (struct target_ops *self); -static void debug_to_terminal_save_ours (void); +static void debug_to_terminal_save_ours (struct target_ops *self); static void debug_to_terminal_ours (struct target_ops *self); @@ -781,7 +781,7 @@ update_current_target (void) (void (*) (struct target_ops *)) target_ignore); de_fault (to_terminal_save_ours, - (void (*) (void)) + (void (*) (struct target_ops *)) target_ignore); de_fault (to_terminal_info, default_terminal_info); @@ -4831,9 +4831,9 @@ debug_to_terminal_ours (struct target_ops *self) } static void -debug_to_terminal_save_ours (void) +debug_to_terminal_save_ours (struct target_ops *self) { - debug_target.to_terminal_save_ours (); + debug_target.to_terminal_save_ours (&debug_target); fprintf_unfiltered (gdb_stdlog, "target_terminal_save_ours ()\n"); } diff --git a/gdb/target.h b/gdb/target.h index e835029d0f7..c4a52fb7b0b 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -491,7 +491,7 @@ struct target_ops void (*to_terminal_inferior) (struct target_ops *); void (*to_terminal_ours_for_output) (struct target_ops *); void (*to_terminal_ours) (struct target_ops *); - void (*to_terminal_save_ours) (void); + void (*to_terminal_save_ours) (struct target_ops *); void (*to_terminal_info) (const char *, int); void (*to_kill) (struct target_ops *); void (*to_load) (char *, int); @@ -1253,7 +1253,7 @@ extern void target_terminal_inferior (void); to take this change into account. */ #define target_terminal_save_ours() \ - (*current_target.to_terminal_save_ours) () + (*current_target.to_terminal_save_ours) (¤t_target) /* Print useful information about our terminal status, if such a thing exists. */ -- 2.30.2