From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 113788 invoked by alias); 30 Apr 2018 05:12:14 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 113686 invoked by uid 89); 30 Apr 2018 05:12:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=1136 X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.164) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 30 Apr 2018 05:12:12 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 1F96B3EF69E for ; Mon, 30 Apr 2018 00:12:11 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id D16hfaasm5CKDD16hf7gVL; Mon, 30 Apr 2018 00:12:11 -0500 X-Authority-Reason: nr=8 Received: from 97-122-176-117.hlrn.qwest.net ([97.122.176.117]:35688 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fD16g-0025zZ-T9; Mon, 30 Apr 2018 00:12:11 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 4/4] Remove interp_name Date: Mon, 30 Apr 2018 05:12:00 -0000 Message-Id: <20180430051207.19979-5-tom@tromey.com> In-Reply-To: <20180430051207.19979-1-tom@tromey.com> References: <20180430051207.19979-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fD16g-0025zZ-T9 X-Source-Sender: 97-122-176-117.hlrn.qwest.net (bapiya.Home) [97.122.176.117]:35688 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-SW-Source: 2018-04/txt/msg00612.txt.bz2 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-04-29 Tom Tromey * 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. --- gdb/ChangeLog | 8 ++++++++ gdb/interps.c | 8 -------- gdb/interps.h | 4 +--- gdb/mi/mi-interp.c | 2 -- gdb/tui/tui.c | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 5884625856..8ec9744fdf 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -274,14 +274,6 @@ scoped_restore_interp::set_interp (const char *name) 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. */ int current_interp_named_p (const char *interp_name) diff --git a/gdb/interps.h b/gdb/interps.h index 694149a6ca..a689be5625 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -98,8 +98,6 @@ extern struct interp *interp_lookup (struct ui *ui, const char *name); interpreter fails to initialize. */ 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 destruction. */ class scoped_restore_interp @@ -113,7 +111,7 @@ public: ~scoped_restore_interp () { - set_interp (interp_name (m_interp)); + set_interp (m_interp->name); } scoped_restore_interp (const scoped_restore_interp &) = delete; diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 99ce1eb5d6..e52d797973 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -113,7 +113,6 @@ void mi_interp::init (bool top_level) { mi_interp *mi = this; - const char *name; int mi_version; /* 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->event_channel = new mi_console_file (mi->raw_stdout, "=", 0); - name = interp_name (this); /* INTERP_MI selects the most recent released version. "mi2" was released as part of GDB 6.0. */ if (strcmp (name, INTERP_MI) == 0) diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 7943a61676..9e2520b4fc 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -415,7 +415,7 @@ tui_enable (void) /* If the top level interpreter is not the console/tui (e.g., MI), enabling curses will certainly lose. */ - interp = interp_name (top_level_interpreter ()); + interp = top_level_interpreter ()->name; if (strcmp (interp, INTERP_TUI) != 0) error (_("Cannot enable the TUI when the interpreter is '%s'"), interp); -- 2.13.6