OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove cleanups from solib.c 

This removes a couple of cleanups from solib.c, replacing one with
std::string and another with unique_xmalloc_ptr.

2018-02-08  Tom Tromey  <tom@tromey.com>

	* solib.c (solib_find_1): Use std::string.
	(solib_bfd_fopen): Use unique_xmalloc_ptr.
This commit is contained in:
Tom Tromey 2018-02-06 13:00:40 -07:00
parent 58ef3771fb
commit 9a897d43f0
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2018-02-08 Tom Tromey <tom@tromey.com>
* solib.c (solib_find_1): Use std::string.
(solib_bfd_fopen): Use unique_xmalloc_ptr.
2018-02-08 Tom Tromey <tom@tromey.com>
* build-id.c (build_id_to_debug_bfd): Use unique_xmalloc_ptr.

14
gdb/solib.c
View File

@ -155,8 +155,7 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib)
int found_file = -1;
char *temp_pathname = NULL;
const char *fskind = effective_target_file_system_kind ();
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
char *sysroot = gdb_sysroot;
const char *sysroot = gdb_sysroot;
int prefix_len, orig_prefix_len;
/* If the absolute prefix starts with "target:" but the filesystem
@ -174,12 +173,13 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib)
while (prefix_len > 0 && IS_DIR_SEPARATOR (sysroot[prefix_len - 1]))
prefix_len--;
std::string sysroot_holder;
if (prefix_len == 0)
sysroot = NULL;
else if (prefix_len != orig_prefix_len)
{
sysroot = savestring (sysroot, prefix_len);
make_cleanup (xfree, sysroot);
sysroot_holder = std::string (sysroot, prefix_len);
sysroot = sysroot_holder.c_str ();
}
/* If we're on a non-DOS-based system, backslashes won't be
@ -251,7 +251,6 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib)
{
if (fd != NULL)
*fd = -1;
do_cleanups (old_chain);
return temp_pathname;
}
@ -300,8 +299,6 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib)
}
}
do_cleanups (old_chain);
/* We try to find the library in various ways. After each attempt,
either found_file >= 0 and temp_pathname is a malloc'd string, or
found_file < 0 and temp_pathname does not point to storage that
@ -480,7 +477,8 @@ solib_bfd_fopen (char *pathname, int fd)
if (abfd == NULL)
{
make_cleanup (xfree, pathname);
/* Arrange to free PATHNAME when the error is thrown. */
gdb::unique_xmalloc_ptr<char> free_pathname (pathname);
error (_("Could not open `%s' as an executable file: %s"),
pathname, bfd_errmsg (bfd_get_error ()));
}