OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove interp_name 

This removes the interp_name function.  It is only used a few spots --
one of which was only calling it on "this".  It's simpler to remove
it; and should class interp become opaque in the future, it will be
just as easy to update the two remaining spots to use an accessor.

ChangeLog
2018-05-25  Tom Tromey	<tom@tromey.com>

	* interps.c (interp_name): Remove.
	* mi/mi-interp.c (mi_interp::init): Update.
	* interps.h (interp_name): Remove.
	(~scoped_restore_interp): Update.
	* tui/tui.c (tui_enable): Update.
This commit is contained in:
Tom Tromey 2018-04-29 23:12:07 -06:00
parent 29f9434081
commit da505cff6e
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2018-05-25 Tom Tromey <tom@tromey.com>
* interps.c (interp_name): Remove.
* mi/mi-interp.c (mi_interp::init): Update.
* interps.h (interp_name): Remove.
(~scoped_restore_interp): Update.
* tui/tui.c (tui_enable): Update.
2018-05-25 Tom Tromey <tom@tromey.com> 2018-05-25 Tom Tromey <tom@tromey.com>
* utils.c (fputs_maybe_filtered): Update. * utils.c (fputs_maybe_filtered): Update.

8
gdb/interps.c
View File

@ -274,14 +274,6 @@ scoped_restore_interp::set_interp (const char *name)
return old_interp; return old_interp;
} }
/* Returns the interpreter's name. */
const char *
interp_name (struct interp *interp)
{
return interp->name;
}
/* Returns true if the current interp is the passed in name. */ /* Returns true if the current interp is the passed in name. */
int int
current_interp_named_p (const char *interp_name) current_interp_named_p (const char *interp_name)

4
gdb/interps.h
View File

@ -98,8 +98,6 @@ extern struct interp *interp_lookup (struct ui *ui, const char *name);
interpreter fails to initialize. */ interpreter fails to initialize. */
extern void set_top_level_interpreter (const char *name); extern void set_top_level_interpreter (const char *name);
extern const char *interp_name (struct interp *interp);
/* Temporarily set the current interpreter, and reset it on /* Temporarily set the current interpreter, and reset it on
destruction. */ destruction. */
class scoped_restore_interp class scoped_restore_interp
@ -113,7 +111,7 @@ public:
~scoped_restore_interp () ~scoped_restore_interp ()
{ {
set_interp (interp_name (m_interp)); set_interp (m_interp->name);
} }
scoped_restore_interp (const scoped_restore_interp &) = delete; scoped_restore_interp (const scoped_restore_interp &) = delete;

2
gdb/mi/mi-interp.c
View File

@ -113,7 +113,6 @@ void
mi_interp::init (bool top_level) mi_interp::init (bool top_level)
{ {
mi_interp *mi = this; mi_interp *mi = this;
const char *name;
int mi_version; int mi_version;
/* Store the current output channel, so that we can create a console /* Store the current output channel, so that we can create a console
@ -129,7 +128,6 @@ mi_interp::init (bool top_level)
mi->targ = new mi_console_file (mi->raw_stdout, "@", '"'); mi->targ = new mi_console_file (mi->raw_stdout, "@", '"');
mi->event_channel = new mi_console_file (mi->raw_stdout, "=", 0); mi->event_channel = new mi_console_file (mi->raw_stdout, "=", 0);
name = interp_name (this);
/* INTERP_MI selects the most recent released version. "mi2" was /* INTERP_MI selects the most recent released version. "mi2" was
released as part of GDB 6.0. */ released as part of GDB 6.0. */
if (strcmp (name, INTERP_MI) == 0) if (strcmp (name, INTERP_MI) == 0)

2
gdb/tui/tui.c
View File

@ -415,7 +415,7 @@ tui_enable (void)
/* If the top level interpreter is not the console/tui (e.g., /* If the top level interpreter is not the console/tui (e.g.,
MI), enabling curses will certainly lose. */ MI), enabling curses will certainly lose. */
interp = interp_name (top_level_interpreter ()); interp = top_level_interpreter ()->name;
if (strcmp (interp, INTERP_TUI) != 0) if (strcmp (interp, INTERP_TUI) != 0)
error (_("Cannot enable the TUI when the interpreter is '%s'"), interp); error (_("Cannot enable the TUI when the interpreter is '%s'"), interp);