diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-12-18 10:31:10 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:47:17 -0700 |
| commit | e19e919feaeb02ea345b2ba577708aa27ea159c6 (patch) | |
| tree | 2116d19a15ca0e084fd27b672cae455a5c88fd85 | |
| parent | c6ea8f7983c639f8bfe180f8216211f2ffc3dfe6 (diff) | |
| download | gdb-e19e919feaeb02ea345b2ba577708aa27ea159c6.zip gdb-e19e919feaeb02ea345b2ba577708aa27ea159c6.tar.gz gdb-e19e919feaeb02ea345b2ba577708aa27ea159c6.tar.bz2 | |
convert to_terminal_info
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_terminal_info.
* target.h (struct target_ops) <to_terminal_info>: Use
TARGET_DEFAULT_FUNC.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/target-delegates.c | 10 | ||||
| -rw-r--r-- | gdb/target.c | 4 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
4 files changed, 21 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 268d560..2405d28 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,14 @@ * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default + to_terminal_info. + * target.h (struct target_ops) <to_terminal_info>: Use + TARGET_DEFAULT_FUNC. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default to_terminal_save_ours. * target.h (struct target_ops) <to_terminal_save_ours>: Use TARGET_DEFAULT_IGNORE. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index d7e4873..92729d6 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -291,6 +291,13 @@ tdefault_terminal_save_ours (struct target_ops *self) } static void +delegate_terminal_info (struct target_ops *self, const char *arg1, int arg2) +{ + self = self->beneath; + self->to_terminal_info (self, arg1, arg2); +} + +static void delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) { self = self->beneath; @@ -403,6 +410,8 @@ install_delegators (struct target_ops *ops) ops->to_terminal_ours = delegate_terminal_ours; if (ops->to_terminal_save_ours == NULL) ops->to_terminal_save_ours = delegate_terminal_save_ours; + if (ops->to_terminal_info == NULL) + ops->to_terminal_info = delegate_terminal_info; if (ops->to_rcmd == NULL) ops->to_rcmd = delegate_rcmd; if (ops->to_can_async_p == NULL) @@ -445,6 +454,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_terminal_ours_for_output = tdefault_terminal_ours_for_output; ops->to_terminal_ours = tdefault_terminal_ours; ops->to_terminal_save_ours = tdefault_terminal_save_ours; + ops->to_terminal_info = default_terminal_info; ops->to_rcmd = default_rcmd; ops->to_can_async_p = find_default_can_async_p; ops->to_is_async_p = find_default_is_async_p; diff --git a/gdb/target.c b/gdb/target.c index ff0eef8..4de2810 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -625,7 +625,7 @@ update_current_target (void) /* Do not inherit to_terminal_ours_for_output. */ /* Do not inherit to_terminal_ours. */ /* Do not inherit to_terminal_save_ours. */ - INHERIT (to_terminal_info, t); + /* Do not inherit to_terminal_info. */ /* Do not inherit to_kill. */ INHERIT (to_load, t); /* Do no inherit to_create_inferior. */ @@ -734,8 +734,6 @@ update_current_target (void) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_terminal_info, - default_terminal_info); de_fault (to_load, (void (*) (struct target_ops *, char *, int)) tcomplain); diff --git a/gdb/target.h b/gdb/target.h index 317a534..cee5150 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -510,7 +510,8 @@ struct target_ops TARGET_DEFAULT_IGNORE (); void (*to_terminal_save_ours) (struct target_ops *) TARGET_DEFAULT_IGNORE (); - void (*to_terminal_info) (struct target_ops *, const char *, int); + void (*to_terminal_info) (struct target_ops *, const char *, int) + TARGET_DEFAULT_FUNC (default_terminal_info); void (*to_kill) (struct target_ops *); void (*to_load) (struct target_ops *, char *, int); void (*to_create_inferior) (struct target_ops *, |