From 0a4f40a208644744287b3e3a080416aede202633 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 17 Dec 2013 21:31:14 -0700
Subject: Add target_ops argument to to_terminal_info

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

	* target.h (struct target_ops) <to_terminal_info>: Add argument.
	(target_terminal_info): Add argument.
	* target.c (debug_to_terminal_info): Add argument.
	(default_terminal_info): Likewise.
	* inflow.c (child_terminal_info): Add 'self' argument.
	* inferior.h (child_terminal_info): Add 'self' argument.
	* go32-nat.c (go32_terminal_info): Add 'self' argument.
---
 gdb/ChangeLog  | 10 ++++++++++
 gdb/go32-nat.c |  2 +-
 gdb/inferior.h |  2 +-
 gdb/inflow.c   |  2 +-
 gdb/target.c   |  9 +++++----
 gdb/target.h   |  4 ++--
 6 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'gdb')

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6447a39..e53c7e6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
+	* target.h (struct target_ops) <to_terminal_info>: Add argument.
+	(target_terminal_info): Add argument.
+	* target.c (debug_to_terminal_info): Add argument.
+	(default_terminal_info): Likewise.
+	* inflow.c (child_terminal_info): Add 'self' argument.
+	* inferior.h (child_terminal_info): Add 'self' argument.
+	* go32-nat.c (go32_terminal_info): Add 'self' argument.
+
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
 	* target.h (struct target_ops) <to_terminal_save_ours>: Add
 	argument.
 	(target_terminal_save_ours): Add argument.
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 4e0b474..75f6a3e 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -852,7 +852,7 @@ go32_terminal_init (struct target_ops *self)
 }
 
 static void
-go32_terminal_info (const char *args, int from_tty)
+go32_terminal_info (struct target_ops *self, const char *args, int from_tty)
 {
   printf_unfiltered ("Inferior's terminal is in %s mode.\n",
 		     !inf_mode_valid
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 938933f..43e035b 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -170,7 +170,7 @@ extern void default_print_registers_info (struct gdbarch *gdbarch,
 					  struct frame_info *frame,
 					  int regnum, int all);
 
-extern void child_terminal_info (const char *, int);
+extern void child_terminal_info (struct target_ops *self, const char *, int);
 
 extern void term_info (char *, int);
 
diff --git a/gdb/inflow.c b/gdb/inflow.c
index fc5a716..09623ab 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -562,7 +562,7 @@ term_info (char *arg, int from_tty)
 }
 
 void
-child_terminal_info (const char *args, int from_tty)
+child_terminal_info (struct target_ops *self, const char *args, int from_tty)
 {
   struct inferior *inf;
   struct terminal_info *tinfo;
diff --git a/gdb/target.c b/gdb/target.c
index 9a0dfc3..9776426 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -47,7 +47,7 @@
 
 static void target_info (char *, int);
 
-static void default_terminal_info (const char *, int);
+static void default_terminal_info (struct target_ops *, const char *, int);
 
 static int default_watchpoint_addr_within_range (struct target_ops *,
 						 CORE_ADDR, CORE_ADDR, int);
@@ -525,7 +525,7 @@ noprocess (void)
 }
 
 static void
-default_terminal_info (const char *args, int from_tty)
+default_terminal_info (struct target_ops *self, const char *args, int from_tty)
 {
   printf_unfiltered (_("No saved terminal information.\n"));
 }
@@ -4839,9 +4839,10 @@ debug_to_terminal_save_ours (struct target_ops *self)
 }
 
 static void
-debug_to_terminal_info (const char *arg, int from_tty)
+debug_to_terminal_info (struct target_ops *self,
+			const char *arg, int from_tty)
 {
-  debug_target.to_terminal_info (arg, from_tty);
+  debug_target.to_terminal_info (&debug_target, arg, from_tty);
 
   fprintf_unfiltered (gdb_stdlog, "target_terminal_info (%s, %d)\n", arg,
 		      from_tty);
diff --git a/gdb/target.h b/gdb/target.h
index c4a52fb..884716a 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -492,7 +492,7 @@ struct target_ops
     void (*to_terminal_ours_for_output) (struct target_ops *);
     void (*to_terminal_ours) (struct target_ops *);
     void (*to_terminal_save_ours) (struct target_ops *);
-    void (*to_terminal_info) (const char *, int);
+    void (*to_terminal_info) (struct target_ops *, const char *, int);
     void (*to_kill) (struct target_ops *);
     void (*to_load) (char *, int);
     void (*to_create_inferior) (struct target_ops *, 
@@ -1259,7 +1259,7 @@ extern void target_terminal_inferior (void);
    exists.  */
 
 #define target_terminal_info(arg, from_tty) \
-     (*current_target.to_terminal_info) (arg, from_tty)
+     (*current_target.to_terminal_info) (&current_target, arg, from_tty)
 
 /* Kill the inferior process.   Make it go away.  */
 
-- 
cgit v1.1