diff options
| author | Tom Tromey <tom@tromey.com> | 2018-03-22 10:41:58 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-03-27 10:46:43 -0600 |
| commit | 5aa892761c6a9f76c5b5ec2a9509e994b4f4de07 (patch) | |
| tree | 25b25b6bdbe00027c3a0a72d9420f9aaecc2ac05 | |
| parent | 1dbeed45b6a81ddcb725b68ff12236e7c8386a47 (diff) | |
| download | gdb-5aa892761c6a9f76c5b5ec2a9509e994b4f4de07.zip gdb-5aa892761c6a9f76c5b5ec2a9509e994b4f4de07.tar.gz gdb-5aa892761c6a9f76c5b5ec2a9509e994b4f4de07.tar.bz2 | |
Remove cleanups from prompt_for_continue
This removes the cleanups from prompt_for_continue by the use of
unique_xmalloc_ptr.
gdb/ChangeLog
2018-03-27 Tom Tromey <tom@tromey.com>
* utils.c (prompt_for_continue): Use unique_xmalloc_ptr.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/utils.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca67054..78f427f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-03-27 Tom Tromey <tom@tromey.com> + + * utils.c (prompt_for_continue): Use unique_xmalloc_ptr. + 2018-03-27 Pedro Alves <palves@redhat.com> Tom Tromey <tom@tromey.com> diff --git a/gdb/utils.c b/gdb/utils.c index 3886efd..ee31f39 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1479,9 +1479,7 @@ set_screen_width_and_height (int width, int height) static void prompt_for_continue (void) { - char *ignore; char cont_prompt[120]; - struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); /* Used to add duration we waited for user to respond to prompt_for_continue_wait_time. */ using namespace std::chrono; @@ -1504,8 +1502,7 @@ prompt_for_continue (void) /* Call gdb_readline_wrapper, not readline, in order to keep an event loop running. */ - ignore = gdb_readline_wrapper (cont_prompt); - make_cleanup (xfree, ignore); + gdb::unique_xmalloc_ptr<char> ignore (gdb_readline_wrapper (cont_prompt)); /* Add time spend in this routine to prompt_for_continue_wait_time. */ prompt_for_continue_wait_time += steady_clock::now () - prompt_started; @@ -1515,7 +1512,7 @@ prompt_for_continue (void) if (ignore != NULL) { - char *p = ignore; + char *p = ignore.get (); while (*p == ' ' || *p == '\t') ++p; @@ -1529,8 +1526,6 @@ prompt_for_continue (void) reinitialize_more_filter (); dont_repeat (); /* Forget prev cmd -- CR won't repeat it. */ - - do_cleanups (old_chain); } /* Initialize timer to keep track of how long we waited for the user. */ |