aboutsummaryrefslogtreecommitdiff
path: root/gdb/linux-nat.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2014-03-14 00:06:45 +0000
committerPedro Alves <palves@redhat.com>2014-03-14 00:06:45 +0000
commitd6b6434614d9752d705d4f3199c3d59330938c66 (patch)
tree85a8fea4ccecc6bb1696aa5d89397bced5e8a32b /gdb/linux-nat.c
parent221c28eceaa29411ef2f54f02f329c39c757e4ca (diff)
downloadgdb-d6b6434614d9752d705d4f3199c3d59330938c66.zip
gdb-d6b6434614d9752d705d4f3199c3d59330938c66.tar.gz
gdb-d6b6434614d9752d705d4f3199c3d59330938c66.tar.bz2
Rename native-only terminal related functions.
Looking at target_terminal_inferior etc. in async mode, I realized that the naming of the terminal_inferior, terminal_ours, etc. functions doesn't really give a clue that they're meant for the native target only. This patch renames them. There's already child_terminal_info using the child_ prefix, and, they're most prominently installed by inf-child.c, so I went with the child_ prefix. I dropped "inferior" from a couple to make the name match the corresponding target method. Tested on x86_64 Fedora 17, and cross built for mingw. I didn't test gnu-nat.c, but I think the change is as obvious as it gets. I grepped the tree looking for other potential spots that would need adjustment but this is all I found. If something breaks, it should be trivial to fix. gdb/ 2014-03-14 Pedro Alves <palves@redhat.com> * inferior.h (terminal_ours_for_output): Rename to ... (child_terminal_ours_for_output): ... this. (terminal_save_ours): Rename to ... (child_terminal_save_ours): ... this. (terminal_ours): Rename to ... (child_terminal_ours): ... this. (terminal_inferior): Rename to ... (child_terminal_inferior): ... this. (terminal_init_inferior): Rename to ... (child_terminal_init_inferior): ... this. (terminal_init_inferior_with_pgrp): Rename to ... (child_terminal_init_inferior_with_pgrp): ... this. * inflow.c (terminal_init_inferior_with_pgrp): Rename to ... (child_terminal_init_with_pgrp): ... this. (terminal_save_ours): Rename to ... (child_terminal_save_ours): ... this. (terminal_init_inferior): Rename to ... (child_terminal_init): ... this. Adjust. (terminal_inferior): Rename to ... (child_terminal_inferior): ... this. (terminal_ours_for_output): Rename to ... (child_terminal_ours_for_output): ... this. Adjust. (terminal_ours): Rename to ... (child_terminal_ours): ... this. (terminal_ours_1): Rename to ... (child_terminal_ours_1): ... this. Adjust. * linux-nat.c (linux_nat_terminal_inferior): Adjust. * windows-nat.c (do_initial_windows_stuff): Adjust. * gnu-nat.c (gnu_terminal_init_inferior): Rename to ... (gnu_terminal_init): ... this. Adjust. (gnu_target): Adjust. * inf-child.c (inf_child_target): Adjust.
Diffstat (limited to 'gdb/linux-nat.c')
-rw-r--r--gdb/linux-nat.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 5535462..b615423 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4568,11 +4568,11 @@ linux_nat_terminal_inferior (struct target_ops *self)
if (!target_is_async_p ())
{
/* Async mode is disabled. */
- terminal_inferior (self);
+ child_terminal_inferior (self);
return;
}
- terminal_inferior (self);
+ child_terminal_inferior (self);
/* Calls to target_terminal_*() are meant to be idempotent. */
if (!async_terminal_is_ours)
@@ -4591,14 +4591,14 @@ linux_nat_terminal_ours (struct target_ops *self)
if (!target_is_async_p ())
{
/* Async mode is disabled. */
- terminal_ours (self);
+ child_terminal_ours (self);
return;
}
/* GDB should never give the terminal to the inferior if the
inferior is running in the background (run&, continue&, etc.),
but claiming it sure should. */
- terminal_ours (self);
+ child_terminal_ours (self);
if (async_terminal_is_ours)
return;