From db68fbe2f946cb36359c8672548fde198f812c4e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 29 Aug 2018 22:42:57 -0600 Subject: [PATCH] Remove cleanup from add_path This removes a cleanup from add_path, replacing it with a use of gdb::unique_xmalloc_ptr. Note that this declaration had to be hoisted somewhat, to avoid inteference from the "goto"s in this function. gdb/ChangeLog 2018-09-13 Tom Tromey * source.c (add_path): Use gdb::unique_xmalloc_ptr. --- gdb/ChangeLog | 4 ++++ gdb/source.c | 16 +++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4c52a65903e..2f4d94dd3e9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-09-13 Tom Tromey + + * source.c (add_path): Use gdb::unique_xmalloc_ptr. + 2018-09-13 Simon Marchi 2018-09-13 Tom Tromey diff --git a/gdb/source.c b/gdb/source.c index cc5c46d0a7b..ec0ea3b81e3 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -479,13 +479,12 @@ add_path (const char *dirname, char **which_path, int parse_separators) else dir_vec.emplace_back (xstrdup (dirname)); - struct cleanup *back_to = make_cleanup (null_cleanup, NULL); - for (const gdb::unique_xmalloc_ptr &name_up : dir_vec) { char *name = name_up.get (); char *p; struct stat st; + gdb::unique_xmalloc_ptr new_name_holder; /* Spaces and tabs will have been removed by buildargv(). NAME is the start of the directory. @@ -531,16 +530,17 @@ add_path (const char *dirname, char **which_path, int parse_separators) } if (name[0] == '~') - name = tilde_expand (name); + new_name_holder.reset (tilde_expand (name)); #ifdef HAVE_DOS_BASED_FILE_SYSTEM else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */ - name = concat (name, ".", (char *)NULL); + new_name_holder.reset (concat (name, ".", (char *) NULL)); #endif else if (!IS_ABSOLUTE_PATH (name) && name[0] != '$') - name = concat (current_directory, SLASH_STRING, name, (char *)NULL); + new_name_holder.reset (concat (current_directory, SLASH_STRING, name, + (char *) NULL)); else - name = savestring (name, p - name); - make_cleanup (xfree, name); + new_name_holder.reset (savestring (name, p - name)); + name = new_name_holder.get (); /* Unless it's a variable, check existence. */ if (name[0] != '$') @@ -630,8 +630,6 @@ add_path (const char *dirname, char **which_path, int parse_separators) skip_dup: ; } - - do_cleanups (back_to); } -- 2.30.2