Index: source/API/SBCommandReturnObject.cpp
===================================================================
--- source/API/SBCommandReturnObject.cpp
+++ source/API/SBCommandReturnObject.cpp
@@ -115,16 +115,6 @@
   return ref().GetErrorData().size();
 }
 
-size_t SBCommandReturnObject::PutOutput(FILE *fh) {
-  LLDB_RECORD_METHOD(size_t, SBCommandReturnObject, PutOutput, (FILE *), fh);
-  if (fh) {
-    size_t num_bytes = GetOutputSize();
-    if (num_bytes)
-      return ::fprintf(fh, "%s", GetOutput());
-  }
-  return 0;
-}
-
 size_t SBCommandReturnObject::PutOutput(FileSP file_sp) {
   LLDB_RECORD_METHOD(size_t, SBCommandReturnObject, PutOutput, (FileSP),
                      file_sp);
@@ -140,17 +130,6 @@
   return file.m_opaque_sp->Printf("%s", GetOutput());
 }
 
-size_t SBCommandReturnObject::PutError(FILE *fh) {
-  LLDB_RECORD_METHOD(size_t, SBCommandReturnObject, PutError, (FILE *), fh);
-
-  if (fh) {
-    size_t num_bytes = GetErrorSize();
-    if (num_bytes)
-      return ::fprintf(fh, "%s", GetError());
-  }
-  return 0;
-}
-
 size_t SBCommandReturnObject::PutError(FileSP file_sp) {
   LLDB_RECORD_METHOD(size_t, SBCommandReturnObject, PutError, (FileSP),
                      file_sp);
@@ -254,36 +233,6 @@
   return true;
 }
 
-void SBCommandReturnObject::SetImmediateOutputFile(FILE *fh) {
-  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
-                     (FILE *), fh);
-
-  SetImmediateOutputFile(fh, false);
-}
-
-void SBCommandReturnObject::SetImmediateErrorFile(FILE *fh) {
-  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
-                     (FILE *), fh);
-
-  SetImmediateErrorFile(fh, false);
-}
-
-void SBCommandReturnObject::SetImmediateOutputFile(FILE *fh,
-                                                   bool transfer_ownership) {
-  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
-                     (FILE *, bool), fh, transfer_ownership);
-  FileSP file = std::make_shared<NativeFile>(fh, transfer_ownership);
-  ref().SetImmediateOutputFile(file);
-}
-
-void SBCommandReturnObject::SetImmediateErrorFile(FILE *fh,
-                                                  bool transfer_ownership) {
-  LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
-                     (FILE *, bool), fh, transfer_ownership);
-  FileSP file = std::make_shared<NativeFile>(fh, transfer_ownership);
-  ref().SetImmediateErrorFile(file);
-}
-
 void SBCommandReturnObject::SetImmediateOutputFile(SBFile file) {
   LLDB_RECORD_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
                      (SBFile), file);
@@ -387,8 +336,6 @@
   LLDB_REGISTER_METHOD(const char *, SBCommandReturnObject, GetError, ());
   LLDB_REGISTER_METHOD(size_t, SBCommandReturnObject, GetOutputSize, ());
   LLDB_REGISTER_METHOD(size_t, SBCommandReturnObject, GetErrorSize, ());
-  LLDB_REGISTER_METHOD(size_t, SBCommandReturnObject, PutOutput, (FILE *));
-  LLDB_REGISTER_METHOD(size_t, SBCommandReturnObject, PutError, (FILE *));
   LLDB_REGISTER_METHOD(size_t, SBCommandReturnObject, PutOutput, (SBFile));
   LLDB_REGISTER_METHOD(size_t, SBCommandReturnObject, PutError, (SBFile));
   LLDB_REGISTER_METHOD(size_t, SBCommandReturnObject, PutOutput, (FileSP));
@@ -406,10 +353,6 @@
                        (const char *));
   LLDB_REGISTER_METHOD(bool, SBCommandReturnObject, GetDescription,
                        (lldb::SBStream &));
-  LLDB_REGISTER_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
-                       (FILE *));
-  LLDB_REGISTER_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
-                       (FILE *));
   LLDB_REGISTER_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
                        (SBFile));
   LLDB_REGISTER_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
@@ -418,10 +361,6 @@
                        (FileSP));
   LLDB_REGISTER_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
                        (FileSP));
-  LLDB_REGISTER_METHOD(void, SBCommandReturnObject, SetImmediateOutputFile,
-                       (FILE *, bool));
-  LLDB_REGISTER_METHOD(void, SBCommandReturnObject, SetImmediateErrorFile,
-                       (FILE *, bool));
   LLDB_REGISTER_METHOD(void, SBCommandReturnObject, PutCString,
                        (const char *, int));
   LLDB_REGISTER_METHOD(const char *, SBCommandReturnObject, GetOutput,