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/Host/common/LockFileBase.cpp | 136 +++++++++++-------------------- 1 file changed, 47 insertions(+), 89 deletions(-) (limited to 'lldb/source/Host/common/LockFileBase.cpp') diff --git a/lldb/source/Host/common/LockFileBase.cpp b/lldb/source/Host/common/LockFileBase.cpp index f7469456118..b30acc5d504 100644 --- a/lldb/source/Host/common/LockFileBase.cpp +++ b/lldb/source/Host/common/LockFileBase.cpp @@ -12,113 +12,71 @@ using namespace lldb; using namespace lldb_private; -namespace -{ +namespace { -Error -AlreadyLocked () -{ - return Error ("Already locked"); -} - -Error -NotLocked () -{ - return Error ("Not locked"); -} +Error AlreadyLocked() { return Error("Already locked"); } +Error NotLocked() { return Error("Not locked"); } } -LockFileBase::LockFileBase (int fd) : - m_fd (fd), - m_locked (false), - m_start (0), - m_len (0) -{ - -} +LockFileBase::LockFileBase(int fd) + : m_fd(fd), m_locked(false), m_start(0), m_len(0) {} -bool -LockFileBase::IsLocked () const -{ - return m_locked; -} +bool LockFileBase::IsLocked() const { return m_locked; } -Error -LockFileBase::WriteLock (const uint64_t start, const uint64_t len) -{ - return DoLock ([&] (const uint64_t start, const uint64_t len) - { - return DoWriteLock (start, len); - }, start, len); +Error LockFileBase::WriteLock(const uint64_t start, const uint64_t len) { + return DoLock([&](const uint64_t start, + const uint64_t len) { return DoWriteLock(start, len); }, + start, len); } -Error -LockFileBase::TryWriteLock (const uint64_t start, const uint64_t len) -{ - return DoLock ([&] (const uint64_t start, const uint64_t len) - { - return DoTryWriteLock (start, len); - }, start, len); +Error LockFileBase::TryWriteLock(const uint64_t start, const uint64_t len) { + return DoLock([&](const uint64_t start, + const uint64_t len) { return DoTryWriteLock(start, len); }, + start, len); } -Error -LockFileBase::ReadLock (const uint64_t start, const uint64_t len) -{ - return DoLock ([&] (const uint64_t start, const uint64_t len) - { - return DoReadLock (start, len); - }, start, len); +Error LockFileBase::ReadLock(const uint64_t start, const uint64_t len) { + return DoLock([&](const uint64_t start, + const uint64_t len) { return DoReadLock(start, len); }, + start, len); } -Error -LockFileBase::TryReadLock (const uint64_t start, const uint64_t len) -{ - return DoLock ([&] (const uint64_t start, const uint64_t len) - { - return DoTryReadLock (start, len); - }, start, len); - +Error LockFileBase::TryReadLock(const uint64_t start, const uint64_t len) { + return DoLock([&](const uint64_t start, + const uint64_t len) { return DoTryReadLock(start, len); }, + start, len); } -Error -LockFileBase::Unlock () -{ - if (!IsLocked ()) - return NotLocked (); - - const auto error = DoUnlock (); - if (error.Success ()) - { - m_locked = false; - m_start = 0; - m_len = 0; - } - return error; +Error LockFileBase::Unlock() { + if (!IsLocked()) + return NotLocked(); + + const auto error = DoUnlock(); + if (error.Success()) { + m_locked = false; + m_start = 0; + m_len = 0; + } + return error; } -bool -LockFileBase::IsValidFile () const -{ - return m_fd != -1; -} +bool LockFileBase::IsValidFile() const { return m_fd != -1; } -Error -LockFileBase::DoLock (const Locker &locker, const uint64_t start, const uint64_t len) -{ - if (!IsValidFile ()) - return Error("File is invalid"); +Error LockFileBase::DoLock(const Locker &locker, const uint64_t start, + const uint64_t len) { + if (!IsValidFile()) + return Error("File is invalid"); - if (IsLocked ()) - return AlreadyLocked (); + if (IsLocked()) + return AlreadyLocked(); - const auto error = locker (start, len); - if (error.Success ()) - { - m_locked = true; - m_start = start; - m_len = len; - } + const auto error = locker(start, len); + if (error.Success()) { + m_locked = true; + m_start = start; + m_len = len; + } - return error; + return error; } -- cgit v1.2.3