Removing the two extra GetXSize(bool) calls since we do not desire to support them...
authorEnrico Granata <egranata@apple.com>
Tue, 16 Oct 2012 21:11:14 +0000 (21:11 +0000)
committerEnrico Granata <egranata@apple.com>
Tue, 16 Oct 2012 21:11:14 +0000 (21:11 +0000)
llvm-svn: 166060

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

index 5de54f7..70ff272 100644 (file)
@@ -98,12 +98,6 @@ public:
     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;
index 81e85ca..e5f062c 100644 (file)
@@ -48,12 +48,6 @@ public:
     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
index e923bba..4d0ffc7 100644 (file)
@@ -306,26 +306,6 @@ SBCommandReturnObject::GetError (bool only_if_no_immediate)
 }
 
 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())
index 11db9b2..ebd4c62 100644 (file)
@@ -1022,12 +1022,12 @@ Driver::HandleIOEvent (const SBEvent &event)
 
         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);