From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10341 invoked by alias); 28 Sep 2017 19:50:21 -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 10126 invoked by uid 89); 28 Sep 2017 19:50:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy=032, displayed X-HELO: gproxy5-pub.mail.unifiedlayer.com Received: from gproxy5-pub.mail.unifiedlayer.com (HELO gproxy5-pub.mail.unifiedlayer.com) (67.222.38.55) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Sep 2017 19:50:18 +0000 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy5.mail.unifiedlayer.com (Postfix) with ESMTP id 295B4140829 for ; Thu, 28 Sep 2017 13:50:17 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id F7qE1w00b2f2jeq017qHJa; Thu, 28 Sep 2017 13:50:17 -0600 X-Authority-Analysis: v=2.2 cv=K/VSJ2eI c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=zstS-IiYAAAA:8 a=zzZnDoABCyp8wQvgeIoA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-0-208.hlrn.qwest.net ([75.166.0.208]:56208 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dxep3-003LpU-Vc; Thu, 28 Sep 2017 13:50:14 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 02/12] Remove cleanup from display_gdb_prompt Date: Thu, 28 Sep 2017 19:50:00 -0000 Message-Id: <20170928195011.27382-3-tom@tromey.com> In-Reply-To: <20170928195011.27382-1-tom@tromey.com> References: <20170928195011.27382-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1dxep3-003LpU-Vc X-Source-Sender: 75-166-0-208.hlrn.qwest.net (bapiya.Home) [75.166.0.208]:56208 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-SW-Source: 2017-09/txt/msg00877.txt.bz2 This removes a cleanup from display_gdb_prompt by using std::string. gdb/ChangeLog 2017-09-28 Tom Tromey * event-top.c (top_level_prompt): Return std::string. (display_gdb_prompt): Update. --- gdb/ChangeLog | 5 +++++ gdb/event-top.c | 22 ++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gdb/event-top.c b/gdb/event-top.c index b1cc8b9..17367ea 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -48,7 +48,7 @@ /* readline defines this. */ #undef savestring -static char *top_level_prompt (void); +static std::string top_level_prompt (); /* Signal handlers. */ #ifdef SIGQUIT @@ -352,16 +352,13 @@ gdb_rl_callback_handler_reinstall (void) void display_gdb_prompt (const char *new_prompt) { - char *actual_gdb_prompt = NULL; - struct cleanup *old_chain; + std::string actual_gdb_prompt; annotate_display_prompt (); /* Reset the nesting depth used when trace-commands is set. */ reset_command_nest_depth (); - old_chain = make_cleanup (free_current_contents, &actual_gdb_prompt); - /* Do not call the python hook on an explicit prompt change as passed to this function, as this forms a secondary/local prompt, IE, displayed but not set. */ @@ -391,7 +388,6 @@ display_gdb_prompt (const char *new_prompt) if (current_ui->command_editing) gdb_rl_callback_handler_remove (); - do_cleanups (old_chain); return; } else if (ui->prompt_state == PROMPT_NEEDED) @@ -402,12 +398,12 @@ display_gdb_prompt (const char *new_prompt) } } else - actual_gdb_prompt = xstrdup (new_prompt); + actual_gdb_prompt = new_prompt; if (current_ui->command_editing) { gdb_rl_callback_handler_remove (); - gdb_rl_callback_handler_install (actual_gdb_prompt); + gdb_rl_callback_handler_install (actual_gdb_prompt.c_str ()); } /* new_prompt at this point can be the top of the stack or the one passed in. It can't be NULL. */ @@ -416,11 +412,9 @@ display_gdb_prompt (const char *new_prompt) /* Don't use a _filtered function here. It causes the assumed character position to be off, since the newline we read from the user is not accounted for. */ - fputs_unfiltered (actual_gdb_prompt, gdb_stdout); + fputs_unfiltered (actual_gdb_prompt.c_str (), gdb_stdout); gdb_flush (gdb_stdout); } - - do_cleanups (old_chain); } /* Return the top level prompt, as specified by "set prompt", possibly @@ -428,7 +422,7 @@ display_gdb_prompt (const char *new_prompt) with the prompt prefix and suffix (annotations). The caller is responsible for freeing the returned string. */ -static char * +static std::string top_level_prompt (void) { char *prompt; @@ -448,10 +442,10 @@ top_level_prompt (void) beginning. */ const char suffix[] = "\n\032\032prompt\n"; - return concat (prefix, prompt, suffix, (char *) NULL); + return std::string (prefix) + prompt + suffix; } - return xstrdup (prompt); + return prompt; } /* See top.h. */ -- 2.9.5