From 707a27cfa82292f14845ce9aa54b9f95cb23fcee Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sat, 11 Dec 2004 17:37:01 +0000 Subject: [PATCH] Rename Path::get -> Path::toString git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18802 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Cygwin/Path.cpp | 2 +- lib/System/SunOS/Path.cpp | 2 +- lib/System/Win32/MappedFile.cpp | 12 ++++++------ lib/System/Win32/MappedFile.inc | 12 ++++++------ lib/System/Win32/Program.cpp | 10 ++++++---- lib/System/Win32/Program.inc | 10 ++++++---- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/lib/System/Cygwin/Path.cpp b/lib/System/Cygwin/Path.cpp index 3b95665f16a..01a40da4e7c 100644 --- a/lib/System/Cygwin/Path.cpp +++ b/lib/System/Cygwin/Path.cpp @@ -43,7 +43,7 @@ Path::GetTemporaryDirectory() { free(pathname); assert(result.isValid() && "tempnam didn't create a valid pathname!"); if (0 != mkdir(result.c_str(), S_IRWXU)) - ThrowErrno(result.get() + ": Can't create temporary directory"); + ThrowErrno(result.toString() + ": Can't create temporary directory"); return result; } diff --git a/lib/System/SunOS/Path.cpp b/lib/System/SunOS/Path.cpp index 7fac37d8d2e..db6db19c38b 100644 --- a/lib/System/SunOS/Path.cpp +++ b/lib/System/SunOS/Path.cpp @@ -43,7 +43,7 @@ Path::GetTemporaryDirectory() { free(pathname); assert(result.isValid() && "tempnam didn't create a valid pathname!"); if (0 != mkdir(result.c_str(), S_IRWXU)) - ThrowErrno(result.get() + ": Can't create temporary directory"); + ThrowErrno(result.toString() + ": Can't create temporary directory"); return result; } diff --git a/lib/System/Win32/MappedFile.cpp b/lib/System/Win32/MappedFile.cpp index 237e1962fbb..d81ef6a0489 100644 --- a/lib/System/Win32/MappedFile.cpp +++ b/lib/System/Win32/MappedFile.cpp @@ -42,7 +42,7 @@ void MappedFile::initialize() { if (info_->hFile == INVALID_HANDLE_VALUE) { delete info_; info_ = NULL; - ThrowError(std::string("Can't open file: ") + path_.get()); + ThrowError(std::string("Can't open file: ") + path_.toString()); } LARGE_INTEGER size; @@ -51,7 +51,7 @@ void MappedFile::initialize() { CloseHandle(info_->hFile); delete info_; info_ = NULL; - ThrowError(std::string("Can't get size of file: ") + path_.get()); + ThrowError(std::string("Can't get size of file: ") + path_.toString()); } } @@ -84,14 +84,14 @@ void* MappedFile::map() { prot = PAGE_READWRITE; info_->hMapping = CreateFileMapping(info_->hFile, NULL, prot, 0, 0, NULL); if (info_->hMapping == NULL) - ThrowError(std::string("Can't map file: ") + path_.get()); + ThrowError(std::string("Can't map file: ") + path_.toString()); prot = (options_ & WRITE_ACCESS) ? FILE_MAP_WRITE : FILE_MAP_READ; base_ = MapViewOfFileEx(info_->hMapping, prot, 0, 0, 0, NULL); if (base_ == NULL) { CloseHandle(info_->hMapping); info_->hMapping = NULL; - ThrowError(std::string("Can't map file: ") + path_.get()); + ThrowError(std::string("Can't map file: ") + path_.toString()); } } return base_; @@ -117,9 +117,9 @@ void MappedFile::size(size_t new_size) { LARGE_INTEGER eof; eof.QuadPart = new_size; if (!SetFilePointerEx(info_->hFile, eof, NULL, FILE_BEGIN)) - ThrowError(std::string("Can't set end of file: ") + path_.get()); + ThrowError(std::string("Can't set end of file: ") + path_.toString()); if (!SetEndOfFile(info_->hFile)) - ThrowError(std::string("Can't set end of file: ") + path_.get()); + ThrowError(std::string("Can't set end of file: ") + path_.toString()); info_->size = new_size; } diff --git a/lib/System/Win32/MappedFile.inc b/lib/System/Win32/MappedFile.inc index 237e1962fbb..d81ef6a0489 100644 --- a/lib/System/Win32/MappedFile.inc +++ b/lib/System/Win32/MappedFile.inc @@ -42,7 +42,7 @@ void MappedFile::initialize() { if (info_->hFile == INVALID_HANDLE_VALUE) { delete info_; info_ = NULL; - ThrowError(std::string("Can't open file: ") + path_.get()); + ThrowError(std::string("Can't open file: ") + path_.toString()); } LARGE_INTEGER size; @@ -51,7 +51,7 @@ void MappedFile::initialize() { CloseHandle(info_->hFile); delete info_; info_ = NULL; - ThrowError(std::string("Can't get size of file: ") + path_.get()); + ThrowError(std::string("Can't get size of file: ") + path_.toString()); } } @@ -84,14 +84,14 @@ void* MappedFile::map() { prot = PAGE_READWRITE; info_->hMapping = CreateFileMapping(info_->hFile, NULL, prot, 0, 0, NULL); if (info_->hMapping == NULL) - ThrowError(std::string("Can't map file: ") + path_.get()); + ThrowError(std::string("Can't map file: ") + path_.toString()); prot = (options_ & WRITE_ACCESS) ? FILE_MAP_WRITE : FILE_MAP_READ; base_ = MapViewOfFileEx(info_->hMapping, prot, 0, 0, 0, NULL); if (base_ == NULL) { CloseHandle(info_->hMapping); info_->hMapping = NULL; - ThrowError(std::string("Can't map file: ") + path_.get()); + ThrowError(std::string("Can't map file: ") + path_.toString()); } } return base_; @@ -117,9 +117,9 @@ void MappedFile::size(size_t new_size) { LARGE_INTEGER eof; eof.QuadPart = new_size; if (!SetFilePointerEx(info_->hFile, eof, NULL, FILE_BEGIN)) - ThrowError(std::string("Can't set end of file: ") + path_.get()); + ThrowError(std::string("Can't set end of file: ") + path_.toString()); if (!SetEndOfFile(info_->hFile)) - ThrowError(std::string("Can't set end of file: ") + path_.get()); + ThrowError(std::string("Can't set end of file: ") + path_.toString()); info_->size = new_size; } diff --git a/lib/System/Win32/Program.cpp b/lib/System/Win32/Program.cpp index ddc939620ea..d6bd86ad2d3 100644 --- a/lib/System/Win32/Program.cpp +++ b/lib/System/Win32/Program.cpp @@ -71,7 +71,7 @@ int Program::ExecuteAndWait(const Path& path, const std::vector& args) { if (!path.executable()) - throw path.get() + " is not executable"; + throw path.toString() + " is not executable"; // Windows wants a command line, not an array of args, to pass to the new // process. We have to concatenate them all, while quoting the args that @@ -124,10 +124,11 @@ Program::ExecuteAndWait(const Path& path, PROCESS_INFORMATION pi; memset(&pi, 0, sizeof(pi)); - if (!CreateProcess(path.get().c_str(), command, NULL, NULL, FALSE, 0, + if (!CreateProcess(path.c_str(), command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { - ThrowError(std::string("Couldn't execute program '") + path.get() + "'"); + ThrowError(std::string("Couldn't execute program '") + + path.toString() + "'"); } // Wait for it to terminate. @@ -142,7 +143,8 @@ Program::ExecuteAndWait(const Path& path, CloseHandle(pi.hThread); if (!rc) - ThrowError(std::string("Failed getting status for program '") + path.get() + "'"); + ThrowError(std::string("Failed getting status for program '") + + path.toString() + "'"); return status; } diff --git a/lib/System/Win32/Program.inc b/lib/System/Win32/Program.inc index ddc939620ea..d6bd86ad2d3 100644 --- a/lib/System/Win32/Program.inc +++ b/lib/System/Win32/Program.inc @@ -71,7 +71,7 @@ int Program::ExecuteAndWait(const Path& path, const std::vector& args) { if (!path.executable()) - throw path.get() + " is not executable"; + throw path.toString() + " is not executable"; // Windows wants a command line, not an array of args, to pass to the new // process. We have to concatenate them all, while quoting the args that @@ -124,10 +124,11 @@ Program::ExecuteAndWait(const Path& path, PROCESS_INFORMATION pi; memset(&pi, 0, sizeof(pi)); - if (!CreateProcess(path.get().c_str(), command, NULL, NULL, FALSE, 0, + if (!CreateProcess(path.c_str(), command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { - ThrowError(std::string("Couldn't execute program '") + path.get() + "'"); + ThrowError(std::string("Couldn't execute program '") + + path.toString() + "'"); } // Wait for it to terminate. @@ -142,7 +143,8 @@ Program::ExecuteAndWait(const Path& path, CloseHandle(pi.hThread); if (!rc) - ThrowError(std::string("Failed getting status for program '") + path.get() + "'"); + ThrowError(std::string("Failed getting status for program '") + + path.toString() + "'"); return status; } -- 2.34.1