diff options
author | Zachary Turner <zturner@google.com> | 2017-05-12 04:51:55 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-05-12 04:51:55 +0000 |
commit | 97206d572797bddc1bba71bb1c18c97f19d69053 (patch) | |
tree | fdf21d24485672cf97c800264d135b9d5d2ecdce /lldb/source/Host/windows/LockFileWindows.cpp | |
parent | 3086b45a2fae833e8419885e78c598d936cc6429 (diff) | |
download | bcm5719-llvm-97206d572797bddc1bba71bb1c18c97f19d69053.tar.gz bcm5719-llvm-97206d572797bddc1bba71bb1c18c97f19d69053.zip |
Rename Error -> Status.
This renames the LLDB error class to Status, as discussed
on the lldb-dev mailing list.
A change of this magnitude cannot easily be done without
find and replace, but that has potential to catch unwanted
occurrences of common strings such as "Error". Every effort
was made to find all the obvious things such as the word "Error"
appearing in a string, etc, but it's possible there are still
some lingering occurences left around. Hopefully nothing too
serious.
llvm-svn: 302872
Diffstat (limited to 'lldb/source/Host/windows/LockFileWindows.cpp')
-rw-r--r-- | lldb/source/Host/windows/LockFileWindows.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/lldb/source/Host/windows/LockFileWindows.cpp b/lldb/source/Host/windows/LockFileWindows.cpp index 0e7f595e6cf..2178fd1f5f6 100644 --- a/lldb/source/Host/windows/LockFileWindows.cpp +++ b/lldb/source/Host/windows/LockFileWindows.cpp @@ -16,22 +16,22 @@ using namespace lldb_private; namespace { -Error fileLock(HANDLE file_handle, DWORD flags, const uint64_t start, - const uint64_t len) { +Status fileLock(HANDLE file_handle, DWORD flags, const uint64_t start, + const uint64_t len) { if (start != 0) - return Error("Non-zero start lock regions are not supported"); + return Status("Non-zero start lock regions are not supported"); OVERLAPPED overlapped = {}; if (!::LockFileEx(file_handle, flags, 0, len, 0, &overlapped) && ::GetLastError() != ERROR_IO_PENDING) - return Error(::GetLastError(), eErrorTypeWin32); + return Status(::GetLastError(), eErrorTypeWin32); DWORD bytes; if (!::GetOverlappedResult(file_handle, &overlapped, &bytes, TRUE)) - return Error(::GetLastError(), eErrorTypeWin32); + return Status(::GetLastError(), eErrorTypeWin32); - return Error(); + return Status(); } } // namespace @@ -45,34 +45,35 @@ bool LockFileWindows::IsValidFile() const { return LockFileBase::IsValidFile() && m_file != INVALID_HANDLE_VALUE; } -Error LockFileWindows::DoWriteLock(const uint64_t start, const uint64_t len) { +Status LockFileWindows::DoWriteLock(const uint64_t start, const uint64_t len) { return fileLock(m_file, LOCKFILE_EXCLUSIVE_LOCK, start, len); } -Error LockFileWindows::DoTryWriteLock(const uint64_t start, - const uint64_t len) { +Status LockFileWindows::DoTryWriteLock(const uint64_t start, + const uint64_t len) { return fileLock(m_file, LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY, start, len); } -Error LockFileWindows::DoReadLock(const uint64_t start, const uint64_t len) { +Status LockFileWindows::DoReadLock(const uint64_t start, const uint64_t len) { return fileLock(m_file, 0, start, len); } -Error LockFileWindows::DoTryReadLock(const uint64_t start, const uint64_t len) { +Status LockFileWindows::DoTryReadLock(const uint64_t start, + const uint64_t len) { return fileLock(m_file, LOCKFILE_FAIL_IMMEDIATELY, start, len); } -Error LockFileWindows::DoUnlock() { +Status LockFileWindows::DoUnlock() { OVERLAPPED overlapped = {}; if (!::UnlockFileEx(m_file, 0, m_len, 0, &overlapped) && ::GetLastError() != ERROR_IO_PENDING) - return Error(::GetLastError(), eErrorTypeWin32); + return Status(::GetLastError(), eErrorTypeWin32); DWORD bytes; if (!::GetOverlappedResult(m_file, &overlapped, &bytes, TRUE)) - return Error(::GetLastError(), eErrorTypeWin32); + return Status(::GetLastError(), eErrorTypeWin32); - return Error(); + return Status(); } |