commit b5ad4ec7a31206227b1cd657dd41b21cc6afc98e
author Greg Clayton <gclayton@apple.com> Mon Apr 29 17:25:54 2013 +0000
committer Greg Clayton <gclayton@apple.com> Mon Apr 29 17:25:54 2013 +0000
tree 68f35ccdff9e1410bca21aeb2e216fa91d45a19f
parent f1f1c626e7fcd3db60641be223308390de288a41

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

lldb/source/Symbol/Block.cpp

diff --git a/lldb/source/Symbol/Block.cpp b/lldb/source/Symbol/Block.cpp
index f410bd6..4ab86e5 100644
--- a/lldb/source/Symbol/Block.cpp
+++ b/lldb/source/Symbol/Block.cpp
@@ -408,9 +408,8 @@
             const Declaration &func_decl = func_type->GetDeclaration();
             if (func_decl.GetLine())
             {
-                log->Printf ("warning: %s/%s:%u block {0x%8.8" PRIx64 "} has range[%u] [0x%" PRIx64 " - 0x%" PRIx64 ") which is not contained in parent block {0x%8.8" PRIx64 "} in function {0x%8.8" PRIx64 "} from %s/%s",
-                             func_decl.GetFile().GetDirectory().GetCString(),
-                             func_decl.GetFile().GetFilename().GetCString(),
+                log->Printf ("warning: %s:%u block {0x%8.8" PRIx64 "} has range[%u] [0x%" PRIx64 " - 0x%" PRIx64 ") which is not contained in parent block {0x%8.8" PRIx64 "} in function {0x%8.8" PRIx64 "} from %s",
+                             func_decl.GetFile().GetPath().c_str(),
                              func_decl.GetLine(),
                              GetID(),
                              (uint32_t)m_ranges.GetSize(),
@@ -418,20 +417,18 @@
                              block_end_addr,
                              parent_block->GetID(),
                              function->GetID(),
-                             module_sp->GetFileSpec().GetDirectory().GetCString(),
-                             module_sp->GetFileSpec().GetFilename().GetCString());
+                             module_sp->GetFileSpec().GetPath().c_str());
             }
             else
             {
-                log->Printf ("warning: block {0x%8.8" PRIx64 "} has range[%u] [0x%" PRIx64 " - 0x%" PRIx64 ") which is not contained in parent block {0x%8.8" PRIx64 "} in function {0x%8.8" PRIx64 "} from %s/%s",
+                log->Printf ("warning: block {0x%8.8" PRIx64 "} has range[%u] [0x%" PRIx64 " - 0x%" PRIx64 ") which is not contained in parent block {0x%8.8" PRIx64 "} in function {0x%8.8" PRIx64 "} from %s",
                              GetID(),
                              (uint32_t)m_ranges.GetSize(),
                              block_start_addr,
                              block_end_addr,
                              parent_block->GetID(),
                              function->GetID(),
-                             module_sp->GetFileSpec().GetDirectory().GetCString(),
-                             module_sp->GetFileSpec().GetFilename().GetCString());
+                             module_sp->GetFileSpec().GetPath().c_str());
             }
         }
         parent_block->AddRange (range);