[llvm] r236409 - Replace windows_error calls with mapWindowsError.
Yaron Keren
yaron.keren at gmail.com
Sun May 3 21:48:10 PDT 2015
Author: yrnkrn
Date: Sun May 3 23:48:10 2015
New Revision: 236409
URL: http://llvm.org/viewvc/llvm-project?rev=236409&view=rev
Log:
Replace windows_error calls with mapWindowsError.
After r210687, windows_error does nothing but call mapWindowsError.
Other Windows/*.inc files directly call mapWindowsError. This patch
updates Path.inc and Process.inc to do the same.
Modified:
llvm/trunk/lib/Support/Windows/Path.inc
llvm/trunk/lib/Support/Windows/Process.inc
Modified: llvm/trunk/lib/Support/Windows/Path.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Path.inc?rev=236409&r1=236408&r2=236409&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/Path.inc (original)
+++ llvm/trunk/lib/Support/Windows/Path.inc Sun May 3 23:48:10 2015
@@ -46,10 +46,6 @@ using llvm::sys::windows::UTF8ToUTF16;
using llvm::sys::windows::UTF16ToUTF8;
using llvm::sys::path::widenPath;
-static std::error_code windows_error(DWORD E) {
- return mapWindowsError(E);
-}
-
static bool is_separator(const wchar_t value) {
switch (value) {
case L'\\':
@@ -83,7 +79,7 @@ std::error_code widenPath(const Twine &P
else {
CurPathLen = ::GetCurrentDirectoryW(0, NULL);
if (CurPathLen == 0)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
}
// Would the absolute path be longer than our limit?
@@ -174,7 +170,7 @@ std::error_code current_path(SmallVector
// A zero return value indicates a failure other than insufficient space.
if (len == 0)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
// If there's insufficient space, the len returned is larger than the len
// given.
@@ -195,7 +191,7 @@ std::error_code create_directory(const T
if (!::CreateDirectoryW(path_utf16.begin(), NULL)) {
DWORD LastError = ::GetLastError();
if (LastError != ERROR_ALREADY_EXISTS || !IgnoreExisting)
- return windows_error(LastError);
+ return mapWindowsError(LastError);
}
return std::error_code();
@@ -212,7 +208,7 @@ std::error_code create_link(const Twine
return ec;
if (!::CreateHardLinkW(wide_from.begin(), wide_to.begin(), NULL))
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
return std::error_code();
}
@@ -232,14 +228,14 @@ std::error_code remove(const Twine &path
if (ST.type() == file_type::directory_file) {
if (!::RemoveDirectoryW(c_str(path_utf16))) {
- std::error_code EC = windows_error(::GetLastError());
+ std::error_code EC = mapWindowsError(::GetLastError());
if (EC != errc::no_such_file_or_directory || !IgnoreNonExisting)
return EC;
}
return std::error_code();
}
if (!::DeleteFileW(c_str(path_utf16))) {
- std::error_code EC = windows_error(::GetLastError());
+ std::error_code EC = mapWindowsError(::GetLastError());
if (EC != errc::no_such_file_or_directory || !IgnoreNonExisting)
return EC;
}
@@ -261,7 +257,7 @@ std::error_code rename(const Twine &from
MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING))
return std::error_code();
DWORD LastError = ::GetLastError();
- ec = windows_error(LastError);
+ ec = mapWindowsError(LastError);
if (LastError != ERROR_ACCESS_DENIED)
break;
// Retry MoveFile() at ACCESS_DENIED.
@@ -295,7 +291,7 @@ std::error_code access(const Twine &Path
DWORD LastError = ::GetLastError();
if (LastError != ERROR_FILE_NOT_FOUND &&
LastError != ERROR_PATH_NOT_FOUND)
- return windows_error(LastError);
+ return mapWindowsError(LastError);
return errc::no_such_file_or_directory;
}
@@ -359,7 +355,7 @@ static std::error_code getStatus(HANDLE
case FILE_TYPE_UNKNOWN: {
DWORD Err = ::GetLastError();
if (Err != NO_ERROR)
- return windows_error(Err);
+ return mapWindowsError(Err);
Result = file_status(file_type::type_unknown);
return std::error_code();
}
@@ -398,7 +394,7 @@ handle_status_error:
Result = file_status(file_type::type_unknown);
else
Result = file_status(file_type::status_error);
- return windows_error(LastError);
+ return mapWindowsError(LastError);
}
std::error_code status(const Twine &path, file_status &result) {
@@ -455,7 +451,7 @@ std::error_code setLastModificationAndAc
FT.dwHighDateTime = UI.HighPart;
HANDLE FileHandle = reinterpret_cast<HANDLE>(_get_osfhandle(FD));
if (!SetFileTime(FileHandle, NULL, &FT, &FT))
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
return std::error_code();
}
@@ -482,7 +478,7 @@ std::error_code mapped_file_region::init
(Offset + Size) & 0xffffffff,
0);
if (FileMappingHandle == NULL) {
- std::error_code ec = windows_error(GetLastError());
+ std::error_code ec = mapWindowsError(GetLastError());
return ec;
}
@@ -498,7 +494,7 @@ std::error_code mapped_file_region::init
Offset & 0xffffffff,
Size);
if (Mapping == NULL) {
- std::error_code ec = windows_error(GetLastError());
+ std::error_code ec = mapWindowsError(GetLastError());
::CloseHandle(FileMappingHandle);
return ec;
}
@@ -507,7 +503,7 @@ std::error_code mapped_file_region::init
MEMORY_BASIC_INFORMATION mbi;
SIZE_T Result = VirtualQuery(Mapping, &mbi, sizeof(mbi));
if (Result == 0) {
- std::error_code ec = windows_error(GetLastError());
+ std::error_code ec = mapWindowsError(GetLastError());
::UnmapViewOfFile(Mapping);
::CloseHandle(FileMappingHandle);
return ec;
@@ -576,7 +572,7 @@ std::error_code detail::directory_iterat
WIN32_FIND_DATAW FirstFind;
ScopedFindHandle FindHandle(::FindFirstFileW(c_str(path_utf16), &FirstFind));
if (!FindHandle)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
size_t FilenameLen = ::wcslen(FirstFind.cFileName);
while ((FilenameLen == 1 && FirstFind.cFileName[0] == L'.') ||
@@ -587,7 +583,7 @@ std::error_code detail::directory_iterat
// Check for end.
if (LastError == ERROR_NO_MORE_FILES)
return detail::directory_iterator_destruct(it);
- return windows_error(LastError);
+ return mapWindowsError(LastError);
} else
FilenameLen = ::wcslen(FirstFind.cFileName);
@@ -622,7 +618,7 @@ std::error_code detail::directory_iterat
// Check for end.
if (LastError == ERROR_NO_MORE_FILES)
return detail::directory_iterator_destruct(it);
- return windows_error(LastError);
+ return mapWindowsError(LastError);
}
size_t FilenameLen = ::wcslen(FindData.cFileName);
@@ -652,7 +648,7 @@ std::error_code openFileForRead(const Tw
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (H == INVALID_HANDLE_VALUE) {
DWORD LastError = ::GetLastError();
- std::error_code EC = windows_error(LastError);
+ std::error_code EC = mapWindowsError(LastError);
// Provide a better error message when trying to open directories.
// This only runs if we failed to open the file, so there is probably
// no performances issues.
@@ -666,7 +662,7 @@ std::error_code openFileForRead(const Tw
int FD = ::_open_osfhandle(intptr_t(H), 0);
if (FD == -1) {
::CloseHandle(H);
- return windows_error(ERROR_INVALID_HANDLE);
+ return mapWindowsError(ERROR_INVALID_HANDLE);
}
ResultFD = FD;
@@ -702,7 +698,7 @@ std::error_code openFileForWrite(const T
if (H == INVALID_HANDLE_VALUE) {
DWORD LastError = ::GetLastError();
- std::error_code EC = windows_error(LastError);
+ std::error_code EC = mapWindowsError(LastError);
// Provide a better error message when trying to open directories.
// This only runs if we failed to open the file, so there is probably
// no performances issues.
@@ -723,7 +719,7 @@ std::error_code openFileForWrite(const T
int FD = ::_open_osfhandle(intptr_t(H), OpenFlags);
if (FD == -1) {
::CloseHandle(H);
- return windows_error(ERROR_INVALID_HANDLE);
+ return mapWindowsError(ERROR_INVALID_HANDLE);
}
ResultFD = FD;
@@ -800,7 +796,7 @@ std::error_code UTF8ToUTF16(llvm::String
utf8.size(), utf16.begin(), 0);
if (len == 0)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
utf16.reserve(len + 1);
utf16.set_size(len);
@@ -809,7 +805,7 @@ std::error_code UTF8ToUTF16(llvm::String
utf8.size(), utf16.begin(), utf16.size());
if (len == 0)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
}
// Make utf16 null terminated.
@@ -829,7 +825,7 @@ std::error_code UTF16ToCodePage(unsigned
0, NULL, NULL);
if (len == 0)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
utf8.reserve(len);
utf8.set_size(len);
@@ -839,7 +835,7 @@ std::error_code UTF16ToCodePage(unsigned
utf8.size(), NULL, NULL);
if (len == 0)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
}
// Make utf8 null terminated.
Modified: llvm/trunk/lib/Support/Windows/Process.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Process.inc?rev=236409&r1=236408&r2=236409&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/Process.inc (original)
+++ llvm/trunk/lib/Support/Windows/Process.inc Sun May 3 23:48:10 2015
@@ -156,10 +156,6 @@ Optional<std::string> Process::GetEnv(St
return std::string(Res.data());
}
-static std::error_code windows_error(DWORD E) {
- return mapWindowsError(E);
-}
-
static void AllocateAndPush(const SmallVectorImpl<char> &S,
SmallVectorImpl<const char *> &Vector,
SpecificBumpPtrAllocator<char> &Allocator) {
@@ -235,7 +231,7 @@ Process::GetArgumentVector(SmallVectorIm
wchar_t **UnicodeCommandLine =
CommandLineToArgvW(GetCommandLineW(), &ArgCount);
if (!UnicodeCommandLine)
- return windows_error(::GetLastError());
+ return mapWindowsError(::GetLastError());
Args.reserve(ArgCount);
std::error_code ec;
More information about the llvm-commits
mailing list