From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/source/API/SBStream.cpp | 271 ++++++++++++++++++------------------------- 1 file changed, 113 insertions(+), 158 deletions(-) (limited to 'lldb/source/API/SBStream.cpp') diff --git a/lldb/source/API/SBStream.cpp b/lldb/source/API/SBStream.cpp index f3be3be..0ade453 100644 --- a/lldb/source/API/SBStream.cpp +++ b/lldb/source/API/SBStream.cpp @@ -17,186 +17,141 @@ using namespace lldb; using namespace lldb_private; -SBStream::SBStream () : - m_opaque_ap (new StreamString()), - m_is_file (false) -{ -} +SBStream::SBStream() : m_opaque_ap(new StreamString()), m_is_file(false) {} -SBStream::SBStream (SBStream &&rhs) : - m_opaque_ap (std::move(rhs.m_opaque_ap)), - m_is_file (rhs.m_is_file) -{ -} +SBStream::SBStream(SBStream &&rhs) + : m_opaque_ap(std::move(rhs.m_opaque_ap)), m_is_file(rhs.m_is_file) {} +SBStream::~SBStream() {} -SBStream::~SBStream () -{ -} - -bool -SBStream::IsValid() const -{ - return (m_opaque_ap.get() != NULL); -} +bool SBStream::IsValid() const { return (m_opaque_ap.get() != NULL); } // If this stream is not redirected to a file, it will maintain a local // cache for the stream data which can be accessed using this accessor. -const char * -SBStream::GetData () -{ - if (m_is_file || m_opaque_ap.get() == NULL) - return NULL; - - return static_cast(m_opaque_ap.get())->GetData(); +const char *SBStream::GetData() { + if (m_is_file || m_opaque_ap.get() == NULL) + return NULL; + + return static_cast(m_opaque_ap.get())->GetData(); } // If this stream is not redirected to a file, it will maintain a local -// cache for the stream output whose length can be accessed using this +// cache for the stream output whose length can be accessed using this // accessor. -size_t -SBStream::GetSize() -{ - if (m_is_file || m_opaque_ap.get() == NULL) - return 0; - - return static_cast(m_opaque_ap.get())->GetSize(); -} +size_t SBStream::GetSize() { + if (m_is_file || m_opaque_ap.get() == NULL) + return 0; -void -SBStream::Printf (const char *format, ...) -{ - if (!format) - return; - va_list args; - va_start (args, format); - ref().PrintfVarArg (format, args); - va_end (args); + return static_cast(m_opaque_ap.get())->GetSize(); } -void -SBStream::RedirectToFile (const char *path, bool append) -{ - if (path == nullptr) - return; - - std::string local_data; - if (m_opaque_ap.get()) - { - // See if we have any locally backed data. If so, copy it so we can then - // redirect it to the file so we don't lose the data - if (!m_is_file) - local_data.swap(static_cast(m_opaque_ap.get())->GetString()); - } - StreamFile *stream_file = new StreamFile; - uint32_t open_options = File::eOpenOptionWrite | File::eOpenOptionCanCreate; - if (append) - open_options |= File::eOpenOptionAppend; - else - open_options |= File::eOpenOptionTruncate; - stream_file->GetFile().Open (path, open_options, lldb::eFilePermissionsFileDefault); - - m_opaque_ap.reset (stream_file); - - if (m_opaque_ap.get()) - { - m_is_file = true; - - // If we had any data locally in our StreamString, then pass that along to - // the to new file we are redirecting to. - if (!local_data.empty()) - m_opaque_ap->Write (&local_data[0], local_data.size()); - } - else - m_is_file = false; +void SBStream::Printf(const char *format, ...) { + if (!format) + return; + va_list args; + va_start(args, format); + ref().PrintfVarArg(format, args); + va_end(args); } -void -SBStream::RedirectToFileHandle (FILE *fh, bool transfer_fh_ownership) -{ - if (fh == nullptr) - return; - - std::string local_data; - if (m_opaque_ap.get()) - { - // See if we have any locally backed data. If so, copy it so we can then - // redirect it to the file so we don't lose the data - if (!m_is_file) - local_data.swap(static_cast(m_opaque_ap.get())->GetString()); - } - m_opaque_ap.reset (new StreamFile (fh, transfer_fh_ownership)); - - if (m_opaque_ap.get()) - { - m_is_file = true; - - // If we had any data locally in our StreamString, then pass that along to - // the to new file we are redirecting to. - if (!local_data.empty()) - m_opaque_ap->Write (&local_data[0], local_data.size()); - } - else - m_is_file = false; +void SBStream::RedirectToFile(const char *path, bool append) { + if (path == nullptr) + return; + + std::string local_data; + if (m_opaque_ap.get()) { + // See if we have any locally backed data. If so, copy it so we can then + // redirect it to the file so we don't lose the data + if (!m_is_file) + local_data.swap( + static_cast(m_opaque_ap.get())->GetString()); + } + StreamFile *stream_file = new StreamFile; + uint32_t open_options = File::eOpenOptionWrite | File::eOpenOptionCanCreate; + if (append) + open_options |= File::eOpenOptionAppend; + else + open_options |= File::eOpenOptionTruncate; + stream_file->GetFile().Open(path, open_options, + lldb::eFilePermissionsFileDefault); + + m_opaque_ap.reset(stream_file); + + if (m_opaque_ap.get()) { + m_is_file = true; + + // If we had any data locally in our StreamString, then pass that along to + // the to new file we are redirecting to. + if (!local_data.empty()) + m_opaque_ap->Write(&local_data[0], local_data.size()); + } else + m_is_file = false; } -void -SBStream::RedirectToFileDescriptor (int fd, bool transfer_fh_ownership) -{ - std::string local_data; - if (m_opaque_ap.get()) - { - // See if we have any locally backed data. If so, copy it so we can then - // redirect it to the file so we don't lose the data - if (!m_is_file) - local_data.swap(static_cast(m_opaque_ap.get())->GetString()); - } - - m_opaque_ap.reset (new StreamFile (::fdopen (fd, "w"), transfer_fh_ownership)); - if (m_opaque_ap.get()) - { - m_is_file = true; - - // If we had any data locally in our StreamString, then pass that along to - // the to new file we are redirecting to. - if (!local_data.empty()) - m_opaque_ap->Write (&local_data[0], local_data.size()); - } - else - m_is_file = false; - +void SBStream::RedirectToFileHandle(FILE *fh, bool transfer_fh_ownership) { + if (fh == nullptr) + return; + + std::string local_data; + if (m_opaque_ap.get()) { + // See if we have any locally backed data. If so, copy it so we can then + // redirect it to the file so we don't lose the data + if (!m_is_file) + local_data.swap( + static_cast(m_opaque_ap.get())->GetString()); + } + m_opaque_ap.reset(new StreamFile(fh, transfer_fh_ownership)); + + if (m_opaque_ap.get()) { + m_is_file = true; + + // If we had any data locally in our StreamString, then pass that along to + // the to new file we are redirecting to. + if (!local_data.empty()) + m_opaque_ap->Write(&local_data[0], local_data.size()); + } else + m_is_file = false; } -lldb_private::Stream * -SBStream::operator->() -{ - return m_opaque_ap.get(); +void SBStream::RedirectToFileDescriptor(int fd, bool transfer_fh_ownership) { + std::string local_data; + if (m_opaque_ap.get()) { + // See if we have any locally backed data. If so, copy it so we can then + // redirect it to the file so we don't lose the data + if (!m_is_file) + local_data.swap( + static_cast(m_opaque_ap.get())->GetString()); + } + + m_opaque_ap.reset(new StreamFile(::fdopen(fd, "w"), transfer_fh_ownership)); + if (m_opaque_ap.get()) { + m_is_file = true; + + // If we had any data locally in our StreamString, then pass that along to + // the to new file we are redirecting to. + if (!local_data.empty()) + m_opaque_ap->Write(&local_data[0], local_data.size()); + } else + m_is_file = false; } -lldb_private::Stream * -SBStream::get() -{ - return m_opaque_ap.get(); -} +lldb_private::Stream *SBStream::operator->() { return m_opaque_ap.get(); } -lldb_private::Stream & -SBStream::ref() -{ - if (m_opaque_ap.get() == NULL) - m_opaque_ap.reset (new StreamString()); - return *m_opaque_ap.get(); +lldb_private::Stream *SBStream::get() { return m_opaque_ap.get(); } + +lldb_private::Stream &SBStream::ref() { + if (m_opaque_ap.get() == NULL) + m_opaque_ap.reset(new StreamString()); + return *m_opaque_ap.get(); } -void -SBStream::Clear () -{ - if (m_opaque_ap.get()) - { - // See if we have any locally backed data. If so, copy it so we can then - // redirect it to the file so we don't lose the data - if (m_is_file) - m_opaque_ap.reset(); - else - static_cast(m_opaque_ap.get())->GetString().clear(); - } +void SBStream::Clear() { + if (m_opaque_ap.get()) { + // See if we have any locally backed data. If so, copy it so we can then + // redirect it to the file so we don't lose the data + if (m_is_file) + m_opaque_ap.reset(); + else + static_cast(m_opaque_ap.get())->GetString().clear(); + } } -- cgit v1.1