aboutsummaryrefslogtreecommitdiff
path: root/gdb/guile/scm-cmd.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-05-26 23:21:23 -0600
committerTom Tromey <tom@tromey.com>2018-07-17 13:21:47 -0600
commit15bf30027bcb167833a0ca2c619c03f177ef1ba4 (patch)
tree117580eb74accac812d65ad76bb839237f0ab4d3 /gdb/guile/scm-cmd.c
parent7eb1a66c26b57803bb4245f84cf15278297bb649 (diff)
downloadgdb-15bf30027bcb167833a0ca2c619c03f177ef1ba4.zip
gdb-15bf30027bcb167833a0ca2c619c03f177ef1ba4.tar.gz
gdb-15bf30027bcb167833a0ca2c619c03f177ef1ba4.tar.bz2
Change gdbscm_exception_message_to_string to return a unique_xmalloc_ptr
This changes gdbscm_exception_message_to_string to return a unique_xmalloc_ptr, allowing for the removal of some cleanups. unique_xmalloc_ptr was chosen because at the root of the call chains is a function from Guile that returns a malloc'd string. gdb/ChangeLog 2018-07-17 Tom Tromey <tom@tromey.com> * guile/scm-param.c (pascm_signal_setshow_error): Update. * guile/guile-internal.h (gdbscm_exception_message_to_string): Update. * guile/scm-cmd.c (cmdscm_function): Update. * guile/scm-pretty-print.c (ppscm_print_exception_unless_memory_error): Update. * guile/scm-exception.c (gdbscm_exception_message_to_string): Return unique_xmalloc_ptr.
Diffstat (limited to 'gdb/guile/scm-cmd.c')
-rw-r--r--gdb/guile/scm-cmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c
index 64243d1..8bb4662 100644
--- a/gdb/guile/scm-cmd.c
+++ b/gdb/guile/scm-cmd.c
@@ -316,10 +316,10 @@ cmdscm_function (struct cmd_list_element *command,
itself. */
if (gdbscm_user_error_p (gdbscm_exception_key (result)))
{
- char *msg = gdbscm_exception_message_to_string (result);
+ gdb::unique_xmalloc_ptr<char> msg
+ = gdbscm_exception_message_to_string (result);
- make_cleanup (xfree, msg);
- error ("%s", msg);
+ error ("%s", msg.get ());
}
else
{