projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make find_separate_debug_file* return std::string
[deliverable/binutils-gdb.git]
/
gdb
/
elfread.c
diff --git
a/gdb/elfread.c
b/gdb/elfread.c
index 103b2144c3a152c9cbe05d8c924dcd2ce9864c24..260789062d03d501ff1a629dbd7de123512fc1b4 100644
(file)
--- a/
gdb/elfread.c
+++ b/
gdb/elfread.c
@@
-1259,17
+1259,16
@@
elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
&& objfile->separate_debug_objfile == NULL
&& objfile->separate_debug_objfile_backlink == NULL)
{
&& objfile->separate_debug_objfile == NULL
&& objfile->separate_debug_objfile_backlink == NULL)
{
- gdb::unique_xmalloc_ptr<char> debugfile
- (find_separate_debug_file_by_buildid (objfile));
+ std::string debugfile = find_separate_debug_file_by_buildid (objfile);
- if (debugfile
== NULL
)
- debugfile
.reset (find_separate_debug_file_by_debuglink (objfile)
);
+ if (debugfile
.empty ()
)
+ debugfile
= find_separate_debug_file_by_debuglink (objfile
);
- if (
debugfile != NULL
)
+ if (
!debugfile.empty ()
)
{
{
- gdb_bfd_ref_ptr abfd (symfile_bfd_open (debugfile.
get
()));
+ gdb_bfd_ref_ptr abfd (symfile_bfd_open (debugfile.
c_str
()));
- symbol_file_add_separate (abfd.get (), debugfile.
get
(),
+ symbol_file_add_separate (abfd.get (), debugfile.
c_str
(),
symfile_flags, objfile);
}
}
symfile_flags, objfile);
}
}
This page took
0.023941 seconds
and
4
git commands to generate.