Improved API logging.

llvm-svn: 117772
diff --git a/lldb/source/API/SBSymbol.cpp b/lldb/source/API/SBSymbol.cpp
index c8bbdc6..f5b09c9 100644
--- a/lldb/source/API/SBSymbol.cpp
+++ b/lldb/source/API/SBSymbol.cpp
@@ -27,16 +27,6 @@
 SBSymbol::SBSymbol (lldb_private::Symbol *lldb_object_ptr) :
     m_opaque_ptr (lldb_object_ptr)
 {
-    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
-
-    if (log)
-    {
-        SBStream sstr;
-        GetDescription (sstr);
-        log->Printf ("SBSymbol::SBSymbol (lldb_object_ptr=%p) => this.obj = %p (%s)", lldb_object_ptr, m_opaque_ptr, 
-                     sstr.GetData());
-                     
-    }
 }
 
 SBSymbol::~SBSymbol ()
@@ -53,32 +43,27 @@
 const char *
 SBSymbol::GetName() const
 {
-    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
-
-    //if (log)
-    //    log->Printf ("SBSymbol::GetName ()");
-
+    const char *name = NULL;
     if (m_opaque_ptr)
-    {
-        if (log)
-            log->Printf ("SBSymbol::GetName (this.obj=%p) => '%s'", m_opaque_ptr, 
-                         m_opaque_ptr->GetMangled().GetName().AsCString());
+        name = m_opaque_ptr->GetMangled().GetName().AsCString();
 
-        return m_opaque_ptr->GetMangled().GetName().AsCString();
-    }
-    
+    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
     if (log)
-        log->Printf ("SBSymbol::GetName (this.obj=%p) => NULL", m_opaque_ptr);
-
-    return NULL;
+        log->Printf ("SBSymbol(%p)::GetName () => \"%s\"", m_opaque_ptr, name ? name : "");
+    return name;
 }
 
 const char *
 SBSymbol::GetMangledName () const
 {
+    const char *name = NULL;
     if (m_opaque_ptr)
-        return m_opaque_ptr->GetMangled().GetMangledName().AsCString();
-    return NULL;
+        name = m_opaque_ptr->GetMangled().GetMangledName().AsCString();
+    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
+    if (log)
+        log->Printf ("SBSymbol(%p)::GetMangledName () => \"%s\"", m_opaque_ptr, name ? name : "");
+
+    return name;
 }