[RFA 02/12] Remove cleanup from display_gdb_prompt

Tom Tromey
2017-09-28T19:50:21Z

This removes a cleanup from display_gdb_prompt by using std::string.

gdb/ChangeLog
2017-09-28 Tom Tromey <tom@tromey.com>

* 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