diff options
| author | Tom Tromey <tom@tromey.com> | 2017-10-16 17:27:21 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-10-19 15:58:12 -0600 |
| commit | 395423c418da2cba1240e39ae944510fe9ffcccc (patch) | |
| tree | d31c21ea8fee11eb2d493865c86499681d67693d | |
| parent | 54f70bc14586878ee14891ecb11efb8a90405874 (diff) | |
| download | gdb-395423c418da2cba1240e39ae944510fe9ffcccc.zip gdb-395423c418da2cba1240e39ae944510fe9ffcccc.tar.gz gdb-395423c418da2cba1240e39ae944510fe9ffcccc.tar.bz2 | |
Remove cleanup from call_function_by_hand_dummy
This changes call_function_by_hand_dummy to use std::string, removing
a cleanup.
ChangeLog
2017-10-19 Tom Tromey <tom@tromey.com>
* infcall.c (call_function_by_hand_dummy): Use std::string.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/infcall.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d7f95a6..49d67bd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2017-10-19 Tom Tromey <tom@tromey.com> + * infcall.c (call_function_by_hand_dummy): Use std::string. + +2017-10-19 Tom Tromey <tom@tromey.com> + * mi/mi-main.c (mi_cmd_execute): Update. * top.h (prepare_execute_command): Return scoped_value_mark. * value.h (class scoped_value_mark): Use DISABLE_COPY_AND_ASSIGN. diff --git a/gdb/infcall.c b/gdb/infcall.c index d384d16..03749f3 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -1308,10 +1308,8 @@ When the function is done executing, GDB will silently stop."), { /* Make a copy as NAME may be in an objfile freed by dummy_frame_pop. */ - char *name = xstrdup (get_function_name (funaddr, - name_buf, sizeof (name_buf))); - make_cleanup (xfree, name); - + std::string name = get_function_name (funaddr, name_buf, + sizeof (name_buf)); if (stopped_by_random_signal) { @@ -1339,7 +1337,7 @@ GDB has restored the context to what it was before the call.\n\ To change this behavior use \"set unwindonsignal off\".\n\ Evaluation of the expression containing the function\n\ (%s) will be abandoned."), - name); + name.c_str ()); } else { @@ -1358,7 +1356,7 @@ To change this behavior use \"set unwindonsignal on\".\n\ Evaluation of the expression containing the function\n\ (%s) will be abandoned.\n\ When the function is done executing, GDB will silently stop."), - name); + name.c_str ()); } } @@ -1380,7 +1378,7 @@ context to its original state before the call.\n\ To change this behaviour use \"set unwind-on-terminating-exception off\".\n\ Evaluation of the expression containing the function (%s)\n\ will be abandoned."), - name); + name.c_str ()); } else if (stop_stack_dummy == STOP_NONE) { @@ -1404,7 +1402,7 @@ The program being debugged stopped while in a function called from GDB.\n\ Evaluation of the expression containing the function\n\ (%s) will be abandoned.\n\ When the function is done executing, GDB will silently stop."), - name); + name.c_str ()); } } |