From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: 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/SBError.cpp | 266 +++++++++++++++++--------------------------- 1 file changed, 101 insertions(+), 165 deletions(-) (limited to 'lldb/source/API/SBError.cpp') diff --git a/lldb/source/API/SBError.cpp b/lldb/source/API/SBError.cpp index 157997b2502..451c0a709ec 100644 --- a/lldb/source/API/SBError.cpp +++ b/lldb/source/API/SBError.cpp @@ -17,221 +17,157 @@ using namespace lldb; using namespace lldb_private; +SBError::SBError() : m_opaque_ap() {} -SBError::SBError () : - m_opaque_ap () -{ +SBError::SBError(const SBError &rhs) : m_opaque_ap() { + if (rhs.IsValid()) + m_opaque_ap.reset(new Error(*rhs)); } -SBError::SBError (const SBError &rhs) : - m_opaque_ap () -{ - if (rhs.IsValid()) - m_opaque_ap.reset (new Error(*rhs)); -} - - -SBError::~SBError() -{ -} +SBError::~SBError() {} -const SBError & -SBError::operator = (const SBError &rhs) -{ - if (rhs.IsValid()) - { - if (m_opaque_ap.get()) - *m_opaque_ap = *rhs; - else - m_opaque_ap.reset (new Error(*rhs)); - } +const SBError &SBError::operator=(const SBError &rhs) { + if (rhs.IsValid()) { + if (m_opaque_ap.get()) + *m_opaque_ap = *rhs; else - m_opaque_ap.reset(); + m_opaque_ap.reset(new Error(*rhs)); + } else + m_opaque_ap.reset(); - return *this; + return *this; } - -const char * -SBError::GetCString () const -{ - if (m_opaque_ap.get()) - return m_opaque_ap->AsCString(); - return NULL; +const char *SBError::GetCString() const { + if (m_opaque_ap.get()) + return m_opaque_ap->AsCString(); + return NULL; } -void -SBError::Clear () -{ - if (m_opaque_ap.get()) - m_opaque_ap->Clear(); +void SBError::Clear() { + if (m_opaque_ap.get()) + m_opaque_ap->Clear(); } -bool -SBError::Fail () const -{ - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); +bool SBError::Fail() const { + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API)); - bool ret_value = false; - if (m_opaque_ap.get()) - ret_value = m_opaque_ap->Fail(); + bool ret_value = false; + if (m_opaque_ap.get()) + ret_value = m_opaque_ap->Fail(); - if (log) - log->Printf ("SBError(%p)::Fail () => %i", - static_cast(m_opaque_ap.get()), ret_value); + if (log) + log->Printf("SBError(%p)::Fail () => %i", + static_cast(m_opaque_ap.get()), ret_value); - return ret_value; + return ret_value; } -bool -SBError::Success () const -{ - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - bool ret_value = true; - if (m_opaque_ap.get()) - ret_value = m_opaque_ap->Success(); +bool SBError::Success() const { + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API)); + bool ret_value = true; + if (m_opaque_ap.get()) + ret_value = m_opaque_ap->Success(); - if (log) - log->Printf ("SBError(%p)::Success () => %i", - static_cast(m_opaque_ap.get()), ret_value); + if (log) + log->Printf("SBError(%p)::Success () => %i", + static_cast(m_opaque_ap.get()), ret_value); - return ret_value; + return ret_value; } -uint32_t -SBError::GetError () const -{ - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); +uint32_t SBError::GetError() const { + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API)); - uint32_t err = 0; - if (m_opaque_ap.get()) - err = m_opaque_ap->GetError(); - - if (log) - log->Printf ("SBError(%p)::GetError () => 0x%8.8x", - static_cast(m_opaque_ap.get()), err); + uint32_t err = 0; + if (m_opaque_ap.get()) + err = m_opaque_ap->GetError(); + if (log) + log->Printf("SBError(%p)::GetError () => 0x%8.8x", + static_cast(m_opaque_ap.get()), err); - return err; + return err; } -ErrorType -SBError::GetType () const -{ - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - ErrorType err_type = eErrorTypeInvalid; - if (m_opaque_ap.get()) - err_type = m_opaque_ap->GetType(); +ErrorType SBError::GetType() const { + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API)); + ErrorType err_type = eErrorTypeInvalid; + if (m_opaque_ap.get()) + err_type = m_opaque_ap->GetType(); - if (log) - log->Printf ("SBError(%p)::GetType () => %i", - static_cast(m_opaque_ap.get()), err_type); + if (log) + log->Printf("SBError(%p)::GetType () => %i", + static_cast(m_opaque_ap.get()), err_type); - return err_type; + return err_type; } -void -SBError::SetError (uint32_t err, ErrorType type) -{ - CreateIfNeeded (); - m_opaque_ap->SetError (err, type); +void SBError::SetError(uint32_t err, ErrorType type) { + CreateIfNeeded(); + m_opaque_ap->SetError(err, type); } -void -SBError::SetError (const Error &lldb_error) -{ - CreateIfNeeded (); - *m_opaque_ap = lldb_error; +void SBError::SetError(const Error &lldb_error) { + CreateIfNeeded(); + *m_opaque_ap = lldb_error; } - -void -SBError::SetErrorToErrno () -{ - CreateIfNeeded (); - m_opaque_ap->SetErrorToErrno (); +void SBError::SetErrorToErrno() { + CreateIfNeeded(); + m_opaque_ap->SetErrorToErrno(); } -void -SBError::SetErrorToGenericError () -{ - CreateIfNeeded (); - m_opaque_ap->SetErrorToErrno (); +void SBError::SetErrorToGenericError() { + CreateIfNeeded(); + m_opaque_ap->SetErrorToErrno(); } -void -SBError::SetErrorString (const char *err_str) -{ - CreateIfNeeded (); - m_opaque_ap->SetErrorString (err_str); +void SBError::SetErrorString(const char *err_str) { + CreateIfNeeded(); + m_opaque_ap->SetErrorString(err_str); } -int -SBError::SetErrorStringWithFormat (const char *format, ...) -{ - CreateIfNeeded (); - va_list args; - va_start (args, format); - int num_chars = m_opaque_ap->SetErrorStringWithVarArg (format, args); - va_end (args); - return num_chars; +int SBError::SetErrorStringWithFormat(const char *format, ...) { + CreateIfNeeded(); + va_list args; + va_start(args, format); + int num_chars = m_opaque_ap->SetErrorStringWithVarArg(format, args); + va_end(args); + return num_chars; } -bool -SBError::IsValid () const -{ - return m_opaque_ap.get() != NULL; -} +bool SBError::IsValid() const { return m_opaque_ap.get() != NULL; } -void -SBError::CreateIfNeeded () -{ - if (m_opaque_ap.get() == NULL) - m_opaque_ap.reset(new Error ()); +void SBError::CreateIfNeeded() { + if (m_opaque_ap.get() == NULL) + m_opaque_ap.reset(new Error()); } +lldb_private::Error *SBError::operator->() { return m_opaque_ap.get(); } -lldb_private::Error * -SBError::operator->() -{ - return m_opaque_ap.get(); -} +lldb_private::Error *SBError::get() { return m_opaque_ap.get(); } -lldb_private::Error * -SBError::get() -{ - return m_opaque_ap.get(); +lldb_private::Error &SBError::ref() { + CreateIfNeeded(); + return *m_opaque_ap; } -lldb_private::Error & -SBError::ref() -{ - CreateIfNeeded(); - return *m_opaque_ap; +const lldb_private::Error &SBError::operator*() const { + // Be sure to call "IsValid()" before calling this function or it will crash + return *m_opaque_ap; } -const lldb_private::Error & -SBError::operator*() const -{ - // Be sure to call "IsValid()" before calling this function or it will crash - return *m_opaque_ap; -} - -bool -SBError::GetDescription (SBStream &description) -{ - if (m_opaque_ap.get()) - { - if (m_opaque_ap->Success()) - description.Printf ("success"); - else - { - const char * err_string = GetCString(); - description.Printf ("error: %s", (err_string != NULL ? err_string : "")); - } +bool SBError::GetDescription(SBStream &description) { + if (m_opaque_ap.get()) { + if (m_opaque_ap->Success()) + description.Printf("success"); + else { + const char *err_string = GetCString(); + description.Printf("error: %s", (err_string != NULL ? err_string : "")); } - else - description.Printf ("error: "); + } else + description.Printf("error: "); - return true; -} + return true; +} -- cgit v1.2.3