summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Granata <egranata@apple.com>2012-10-16 21:11:14 +0000
committerEnrico Granata <egranata@apple.com>2012-10-16 21:11:14 +0000
commit430e540b6b602430490d87001cc386101172ccf4 (patch)
treeb960e53b46297f294d904595d50dfd19390b06de
parent8db50561b0e4fe7baa1b0b1e7cd03cd4bc4975cd (diff)
downloadbcm5719-llvm-430e540b6b602430490d87001cc386101172ccf4.tar.gz
bcm5719-llvm-430e540b6b602430490d87001cc386101172ccf4.zip
Removing the two extra GetXSize(bool) calls since we do not desire to support them long-term
llvm-svn: 166060
-rw-r--r--lldb/include/lldb/API/SBCommandReturnObject.h6
-rw-r--r--lldb/scripts/Python/interface/SBCommandReturnObject.i6
-rw-r--r--lldb/source/API/SBCommandReturnObject.cpp20
-rw-r--r--lldb/tools/driver/Driver.cpp4
4 files changed, 2 insertions, 34 deletions
diff --git a/lldb/include/lldb/API/SBCommandReturnObject.h b/lldb/include/lldb/API/SBCommandReturnObject.h
index 5de54f77592..70ff2721592 100644
--- a/lldb/include/lldb/API/SBCommandReturnObject.h
+++ b/lldb/include/lldb/API/SBCommandReturnObject.h
@@ -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;
diff --git a/lldb/scripts/Python/interface/SBCommandReturnObject.i b/lldb/scripts/Python/interface/SBCommandReturnObject.i
index 81e85ca8c21..e5f062c2240 100644
--- a/lldb/scripts/Python/interface/SBCommandReturnObject.i
+++ b/lldb/scripts/Python/interface/SBCommandReturnObject.i
@@ -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
diff --git a/lldb/source/API/SBCommandReturnObject.cpp b/lldb/source/API/SBCommandReturnObject.cpp
index e923bba1041..4d0ffc75fe3 100644
--- a/lldb/source/API/SBCommandReturnObject.cpp
+++ b/lldb/source/API/SBCommandReturnObject.cpp
@@ -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())
diff --git a/lldb/tools/driver/Driver.cpp b/lldb/tools/driver/Driver.cpp
index 11db9b27270..ebd4c62d995 100644
--- a/lldb/tools/driver/Driver.cpp
+++ b/lldb/tools/driver/Driver.cpp
@@ -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);
OpenPOWER on IntegriCloud