From 7c218e6c9c88cb8120adf1a7a530cfdec23aaf81 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Apr 2017 23:08:16 -0600 Subject: [PATCH] Use unique_xmalloc_ptr in jit.c This removes some cleanups from jit.c by using unique_xmalloc_ptr instead. ChangeLog 2017-08-03 Tom Tromey * jit.c (jit_reader_load_command): Use unique_xmalloc_ptr. --- gdb/ChangeLog | 4 ++++ gdb/jit.c | 19 +++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c13045865b1..56fc66199f2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-08-03 Tom Tromey + + * jit.c (jit_reader_load_command): Use unique_xmalloc_ptr. + 2017-08-03 Tom Tromey * tui/tui-regs.c (tui_restore_gdbout): Remove. diff --git a/gdb/jit.c b/gdb/jit.c index ddf1005b649..725d41ef0a5 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -211,29 +211,20 @@ jit_reader_load (const char *file_name) static void jit_reader_load_command (char *args, int from_tty) { - char *so_name; - struct cleanup *prev_cleanup; - if (args == NULL) error (_("No reader name provided.")); - args = tilde_expand (args); - prev_cleanup = make_cleanup (xfree, args); + gdb::unique_xmalloc_ptr file (tilde_expand (args)); if (loaded_jit_reader != NULL) error (_("JIT reader already loaded. Run jit-reader-unload first.")); - if (IS_ABSOLUTE_PATH (args)) - so_name = args; - else - { - so_name = xstrprintf ("%s%s%s", jit_reader_dir, SLASH_STRING, args); - make_cleanup (xfree, so_name); - } + if (!IS_ABSOLUTE_PATH (file.get ())) + file.reset (xstrprintf ("%s%s%s", jit_reader_dir, SLASH_STRING, + file.get ())); - loaded_jit_reader = jit_reader_load (so_name); + loaded_jit_reader = jit_reader_load (file.get ()); reinit_frame_cache (); jit_inferior_created_hook (); - do_cleanups (prev_cleanup); } /* Provides the jit-reader-unload command. */ -- 2.30.2