1 files changed, 14 insertions, 10 deletions

diff --git a/lldb/source/API/SBCommandReturnObject.cpp b/lldb/source/API/SBCommandReturnObject.cpp
index 32600b882ce..d4091ce49bf 100644
--- a/lldb/source/API/SBCommandReturnObject.cpp
+++ b/lldb/source/API/SBCommandReturnObject.cpp
@@ -19,10 +19,10 @@ using namespace lldb_private;
 SBCommandReturnObject::SBCommandReturnObject () :
     m_opaque_ap (new CommandReturnObject ())
 {
-    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API | LIBLLDB_LOG_VERBOSE);
+    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
 
     if (log)
-        log->Printf ("SBCommandReturnObject::SBCommandReturnObject () ==> this = %p", this);
+        log->Printf ("SBCommandReturnObject::SBCommandReturnObject () => this.ap = %p", m_opaque_ap.get());
 }
 
 SBCommandReturnObject::~SBCommandReturnObject ()
@@ -42,18 +42,20 @@ SBCommandReturnObject::GetOutput ()
 {
     Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
 
-    if (log)
-        log->Printf ("SBCommandReturnObject::GetOutput ()");
+    //if (log)
+    //    log->Printf ("SBCommandReturnObject::GetOutput ()");
 
     if (m_opaque_ap.get())
     {
         if (log)
-            log->Printf ("SBCommandReturnObject::GetOutput ==> %s", m_opaque_ap->GetOutputStream().GetData());
+            log->Printf ("SBCommandReturnObject::GetOutput (this.ap=%p) => '%s'", m_opaque_ap.get(), 
+                         m_opaque_ap->GetOutputStream().GetData());
+
         return m_opaque_ap->GetOutputStream().GetData();
     }
 
     if (log)
-        log->Printf ("SBCommandReturnObject::GetOutput ==> NULL");
+        log->Printf ("SBCommandReturnObject::GetOutput (this.ap=%p) => 'NULL'", m_opaque_ap.get());
 
     return NULL;
 }
@@ -63,18 +65,20 @@ SBCommandReturnObject::GetError ()
 {
     Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
 
-    if (log)
-        log->Printf ("SBCommandReturnObject::GetError ()");
+    //if (log)
+    //    log->Printf ("SBCommandReturnObject::GetError ()");
 
     if (m_opaque_ap.get())
     {
         if (log)
-            log->Printf ("SBCommandReturnObject::GetError ==> %s", m_opaque_ap->GetErrorStream().GetData());
+            log->Printf ("SBCommandReturnObject::GetError (this.ap=%p) => '%s'", m_opaque_ap.get(),
+                         m_opaque_ap->GetErrorStream().GetData());
+
         return m_opaque_ap->GetErrorStream().GetData();
     }
     
     if (log)
-        log->Printf ("SBCommandReturnObject::GetError ==> NULL");
+        log->Printf ("SBCommandReturnObject::GetError (this.ap=%p) => 'NULL'", m_opaque_ap.get());
 
     return NULL;
 }