convert to_terminal_ours

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_terminal_ours.
	* target.h (struct target_ops) <to_terminal_ours>: Use
	TARGET_DEFAULT_IGNORE.
This commit is contained in:
Tom Tromey 2013-12-18 10:30:16 -07:00
parent 74fcbef986
commit e4a733f17e
4 changed files with 26 additions and 5 deletions

View File

@ -1,3 +1,11 @@
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_terminal_ours.
* target.h (struct target_ops) <to_terminal_ours>: Use
TARGET_DEFAULT_IGNORE.
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.

View File

@ -266,6 +266,18 @@ tdefault_terminal_ours_for_output (struct target_ops *self)
{
}
static void
delegate_terminal_ours (struct target_ops *self)
{
self = self->beneath;
self->to_terminal_ours (self);
}
static void
tdefault_terminal_ours (struct target_ops *self)
{
}
static void
delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
{
@ -375,6 +387,8 @@ install_delegators (struct target_ops *ops)
ops->to_terminal_inferior = delegate_terminal_inferior;
if (ops->to_terminal_ours_for_output == NULL)
ops->to_terminal_ours_for_output = delegate_terminal_ours_for_output;
if (ops->to_terminal_ours == NULL)
ops->to_terminal_ours = delegate_terminal_ours;
if (ops->to_rcmd == NULL)
ops->to_rcmd = delegate_rcmd;
if (ops->to_can_async_p == NULL)
@ -415,6 +429,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_terminal_init = tdefault_terminal_init;
ops->to_terminal_inferior = tdefault_terminal_inferior;
ops->to_terminal_ours_for_output = tdefault_terminal_ours_for_output;
ops->to_terminal_ours = tdefault_terminal_ours;
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;

View File

@ -623,7 +623,7 @@ update_current_target (void)
/* Do not inherit to_terminal_init. */
/* Do not inherit to_terminal_inferior. */
/* Do not inherit to_terminal_ours_for_output. */
INHERIT (to_terminal_ours, t);
/* Do not inherit to_terminal_ours. */
INHERIT (to_terminal_save_ours, t);
INHERIT (to_terminal_info, t);
/* Do not inherit to_kill. */
@ -734,9 +734,6 @@ update_current_target (void)
(int (*) (CORE_ADDR, gdb_byte *, int, int,
struct mem_attrib *, struct target_ops *))
nomemory);
de_fault (to_terminal_ours,
(void (*) (struct target_ops *))
target_ignore);
de_fault (to_terminal_save_ours,
(void (*) (struct target_ops *))
target_ignore);

View File

@ -506,7 +506,8 @@ struct target_ops
TARGET_DEFAULT_IGNORE ();
void (*to_terminal_ours_for_output) (struct target_ops *)
TARGET_DEFAULT_IGNORE ();
void (*to_terminal_ours) (struct target_ops *);
void (*to_terminal_ours) (struct target_ops *)
TARGET_DEFAULT_IGNORE ();
void (*to_terminal_save_ours) (struct target_ops *);
void (*to_terminal_info) (struct target_ops *, const char *, int);
void (*to_kill) (struct target_ops *);