[Lldb-commits] [lldb] r166060 - in /lldb/trunk: include/lldb/API/SBCommandReturnObject.h scripts/Python/interface/SBCommandReturnObject.i source/API/SBCommandReturnObject.cpp tools/driver/Driver.cpp

[Enrico Granata]

Author: enrico
Date: Tue Oct 16 16:11:14 2012
New Revision: 166060

URL: http://llvm.org/viewvc/llvm-project?rev=166060&view=rev
Log:
Removing the two extra GetXSize(bool) calls since we do not desire to support them long-term

Modified:
    lldb/trunk/include/lldb/API/SBCommandReturnObject.h
    lldb/trunk/scripts/Python/interface/SBCommandReturnObject.i
    lldb/trunk/source/API/SBCommandReturnObject.cpp
    lldb/trunk/tools/driver/Driver.cpp

Modified: lldb/trunk/include/lldb/API/SBCommandReturnObject.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBCommandReturnObject.h?rev=166060&r1=166059&r2=166060&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBCommandReturnObject.h (original)
+++ lldb/trunk/include/lldb/API/SBCommandReturnObject.h Tue Oct 16 16:11:14 2012
@@ -98,12 +98,6 @@
     const char *
     GetError (bool only_if_no_immediate);
     
-    size_t
-    GetErrorSize (bool only_if_no_immediate);
-    
-    size_t
-    GetOutputSize (bool only_if_no_immediate);
-    
 protected:
     friend class SBCommandInterpreter;
     friend class SBOptions;

Modified: lldb/trunk/scripts/Python/interface/SBCommandReturnObject.i
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SBCommandReturnObject.i?rev=166060&r1=166059&r2=166060&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/interface/SBCommandReturnObject.i (original)
+++ lldb/trunk/scripts/Python/interface/SBCommandReturnObject.i Tue Oct 16 16:11:14 2012
@@ -48,12 +48,6 @@
     GetError (bool if_no_immediate);
     
     size_t
-    GetErrorSize (bool only_if_no_immediate);
-    
-    size_t
-    GetOutputSize (bool only_if_no_immediate);
-    
-    size_t
     PutOutput (FILE *fh);
     
     size_t

Modified: lldb/trunk/source/API/SBCommandReturnObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBCommandReturnObject.cpp?rev=166060&r1=166059&r2=166060&view=diff
==============================================================================
--- lldb/trunk/source/API/SBCommandReturnObject.cpp (original)
+++ lldb/trunk/source/API/SBCommandReturnObject.cpp Tue Oct 16 16:11:14 2012
@@ -306,26 +306,6 @@
 }
 
 size_t
-SBCommandReturnObject::GetErrorSize (bool only_if_no_immediate)
-{
-    if (!m_opaque_ap.get())
-        return NULL;
-    if (only_if_no_immediate == false || m_opaque_ap->GetImmediateErrorStream().get() == NULL)
-        return GetErrorSize();
-    return NULL;
-}
-
-size_t
-SBCommandReturnObject::GetOutputSize (bool only_if_no_immediate)
-{
-    if (!m_opaque_ap.get())
-        return NULL;
-    if (only_if_no_immediate == false || m_opaque_ap->GetImmediateOutputStream().get() == NULL)
-        return GetOutputSize();
-    return NULL;
-}
-
-size_t
 SBCommandReturnObject::Printf(const char* format, ...)
 {
     if (m_opaque_ap.get())

Modified: lldb/trunk/tools/driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Driver.cpp?rev=166060&r1=166059&r2=166060&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Driver.cpp (original)
+++ lldb/trunk/tools/driver/Driver.cpp Tue Oct 16 16:11:14 2012
@@ -1022,12 +1022,12 @@
 
         const bool only_if_no_immediate = true;
 
-        const size_t output_size = result.GetOutputSize(only_if_no_immediate);
+        const size_t output_size = result.GetOutputSize();
         
         if (output_size > 0)
             m_io_channel_ap->OutWrite (result.GetOutput(only_if_no_immediate), output_size, NO_ASYNC);
 
-        const size_t error_size = result.GetErrorSize(only_if_no_immediate);
+        const size_t error_size = result.GetErrorSize();
 
         if (error_size > 0)
             m_io_channel_ap->OutWrite (result.GetError(only_if_no_immediate), error_size, NO_ASYNC);