Cleanup logging to use the new "std::string FileSpec::GetPath()" function. Also added a similar function for modules:

std::string
Module::GetSpecificationDescription () const;

This returns the module as "/usr/lib/libfoo.dylib" for normal files (calls "std::string FileSpec::GetPath()" on m_file) but it also might include the object name in case the module is for a .o file in a BSD archive ("/usr/lib/libfoo.a(bar.o)"). Cleaned up necessary logging code to use it.

llvm-svn: 180717
This commit is contained in:
Greg Clayton
2013-04-29 17:25:54 +00:00
parent f1f1c626e7
commit b5ad4ec7a3
33 changed files with 185 additions and 275 deletions

View File

@@ -1916,11 +1916,10 @@ ObjectFileMachO::ParseSymtab (bool minimize)
// string values should have an offset zero which points
// to an empty C-string
Host::SystemLog (Host::eSystemLogError,
"error: DSC unmapped local symbol[%u] has invalid string table offset 0x%x in %s/%s, ignoring symbol\n",
"error: DSC unmapped local symbol[%u] has invalid string table offset 0x%x in %s, ignoring symbol\n",
entry_index,
nlist.n_strx,
module_sp->GetFileSpec().GetDirectory().GetCString(),
module_sp->GetFileSpec().GetFilename().GetCString());
module_sp->GetFileSpec().GetPath().c_str());
continue;
}
if (symbol_name[0] == '\0')
@@ -2653,11 +2652,10 @@ ObjectFileMachO::ParseSymtab (bool minimize)
// string values should have an offset zero which points
// to an empty C-string
Host::SystemLog (Host::eSystemLogError,
"error: symbol[%u] has invalid string table offset 0x%x in %s/%s, ignoring symbol\n",
"error: symbol[%u] has invalid string table offset 0x%x in %s, ignoring symbol\n",
nlist_idx,
nlist.n_strx,
module_sp->GetFileSpec().GetDirectory().GetCString(),
module_sp->GetFileSpec().GetFilename().GetCString());
module_sp->GetFileSpec().GetPath().c_str());
continue;
}
if (symbol_name[0] == '\0')