espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-18 05:12:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change gdb_abspath to return a unique_xmalloc_ptr

Browse Source 
This changes gdb_abspath to return a unique_xmalloc_ptr, and fixes up
the callers.  This allows the removal of a cleanup, and also puts
ownership rules into the API, where they belong.

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

	* compile/compile.c (compile_file_command): Use
	gdb::unique_xmalloc_ptr, std::string.
	* utils.c (gdb_abspath): Change return type.
	* source.c (openp): Update.
	* objfiles.c (allocate_objfile): Update.
	* main.c (set_gdb_data_directory): Update.
	* utils.h (gdb_abspath): Return a gdb::unique_xmalloc_ptr.
This commit is contained in:
Tom Tromey
2017-08-03 16:32:14 -06:00
parent 0d999a6ef0
commit e3e41d588a
7 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gdb/utils.c
View File

@ -2761,28 +2761,25 @@ gdb_realpath_keepfile (const char *filename)
/* Return PATH in absolute form, performing tilde-expansion if necessary.
PATH cannot be NULL or the empty string.
This does not resolve symlinks however, use gdb_realpath for that.
Space for the result is allocated with malloc.
If the path is already absolute, it is strdup'd.
If there is a problem computing the absolute path, the path is returned
unchanged (still strdup'd). */
This does not resolve symlinks however, use gdb_realpath for that. */
char *
gdb::unique_xmalloc_ptr<char>
gdb_abspath (const char *path)
{
gdb_assert (path != NULL && path[0] != '\0');
if (path[0] == '~')
return tilde_expand (path);
return gdb::unique_xmalloc_ptr<char> (tilde_expand (path));
if (IS_ABSOLUTE_PATH (path))
return xstrdup (path);
return gdb::unique_xmalloc_ptr<char> (xstrdup (path));
/* Beware the // my son, the Emacs barfs, the botch that catch... */
return concat (current_directory,
IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])
? "" : SLASH_STRING,
path, (char *) NULL);
return gdb::unique_xmalloc_ptr<char>
(concat (current_directory,
IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])
? "" : SLASH_STRING,
path, (char *) NULL));
}
ULONGEST