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

Change gdb_realpath_keepfile to return a unique_xmalloc_ptr 

This changes gdb_realpath_keepfile to return a unique_xmalloc_ptr, and
fixes up the callers.

ChangeLog
2017-08-22  Tom Tromey  <tom@tromey.com>

	* utils.c (gdb_realpath_keepfile): Return a
	gdb::unique_xmalloc_ptr.
	* exec.c (exec_file_attach): Update.
	* utils.h (gdb_realpath_keepfile): Return a
	gdb::unique_xmalloc_ptr.
This commit is contained in:
Tom Tromey 2017-08-03 16:34:56 -06:00
parent e3e41d588a
commit 4971c9a74b
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2017-08-22 Tom Tromey <tom@tromey.com>
* utils.c (gdb_realpath_keepfile): Return a
gdb::unique_xmalloc_ptr.
* exec.c (exec_file_attach): Update.
* utils.h (gdb_realpath_keepfile): Return a
gdb::unique_xmalloc_ptr.
2017-08-22 Tom Tromey <tom@tromey.com> 2017-08-22 Tom Tromey <tom@tromey.com>
* compile/compile.c (compile_file_command): Use * compile/compile.c (compile_file_command): Use

2
gdb/exec.c
View File

@ -352,7 +352,7 @@ exec_file_attach (const char *filename, int from_tty)
if (load_via_target) if (load_via_target)
exec_filename = xstrdup (bfd_get_filename (exec_bfd)); exec_filename = xstrdup (bfd_get_filename (exec_bfd));
else else
exec_filename = gdb_realpath_keepfile (scratch_pathname); exec_filename = gdb_realpath_keepfile (scratch_pathname).release ();
if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching)) if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching))
{ {

6
gdb/utils.c
View File

@ -2716,7 +2716,7 @@ gdb_realpath (const char *filename)
/* Return a copy of FILENAME, with its directory prefix canonicalized /* Return a copy of FILENAME, with its directory prefix canonicalized
by gdb_realpath. */ by gdb_realpath. */
char * gdb::unique_xmalloc_ptr<char>
gdb_realpath_keepfile (const char *filename) gdb_realpath_keepfile (const char *filename)
{ {
const char *base_name = lbasename (filename); const char *base_name = lbasename (filename);
@ -2727,7 +2727,7 @@ gdb_realpath_keepfile (const char *filename)
/* Extract the basename of filename, and return immediately /* Extract the basename of filename, and return immediately
a copy of filename if it does not contain any directory prefix. */ a copy of filename if it does not contain any directory prefix. */
if (base_name == filename) if (base_name == filename)
return xstrdup (filename); return gdb::unique_xmalloc_ptr<char> (xstrdup (filename));
dir_name = (char *) alloca ((size_t) (base_name - filename + 2)); dir_name = (char *) alloca ((size_t) (base_name - filename + 2));
/* Allocate enough space to store the dir_name + plus one extra /* Allocate enough space to store the dir_name + plus one extra
@ -2756,7 +2756,7 @@ gdb_realpath_keepfile (const char *filename)
result = concat (real_path, SLASH_STRING, base_name, (char *) NULL); result = concat (real_path, SLASH_STRING, base_name, (char *) NULL);
xfree (real_path); xfree (real_path);
return result; return gdb::unique_xmalloc_ptr<char> (result);
} }
/* Return PATH in absolute form, performing tilde-expansion if necessary. /* Return PATH in absolute form, performing tilde-expansion if necessary.

2
gdb/utils.h
View File

@ -254,7 +254,7 @@ extern struct cleanup *make_bpstat_clear_actions_cleanup (void);
extern char *gdb_realpath (const char *); extern char *gdb_realpath (const char *);
extern char *gdb_realpath_keepfile (const char *); extern gdb::unique_xmalloc_ptr<char> gdb_realpath_keepfile (const char *);
extern gdb::unique_xmalloc_ptr<char> gdb_abspath (const char *); extern gdb::unique_xmalloc_ptr<char> gdb_abspath (const char *);