diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2010-03-12 14:17:24 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2010-03-12 14:17:24 +0000 |
| commit | 16ceb3aaf753e1a59760276c707087e95133695e (patch) | |
| tree | a1b849b1010dcbfc65c26cdf6af2c55661e1df62 /lib/System | |
| parent | 018cbd5ddf11a0bbab48cc2a374148bdfce9a9e2 (diff) | |
| download | external_llvm-16ceb3aaf753e1a59760276c707087e95133695e.zip external_llvm-16ceb3aaf753e1a59760276c707087e95133695e.tar.gz external_llvm-16ceb3aaf753e1a59760276c707087e95133695e.tar.bz2 | |
Remove superfluous NULL assignment
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98350 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/System')
| -rw-r--r-- | lib/System/Win32/Path.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc index b5f6374..5a0052f 100644 --- a/lib/System/Win32/Path.inc +++ b/lib/System/Win32/Path.inc @@ -126,7 +126,7 @@ Path::isValid() const { } void Path::makeAbsolute() { - TCHAR FullPath[MAX_PATH + 1] = {0}; + TCHAR FullPath[MAX_PATH + 1] = {0}; LPTSTR FilePart = NULL; DWORD RetLength = ::GetFullPathNameA(path.c_str(), @@ -161,7 +161,7 @@ Path::isAbsolute(const char *NameStart, unsigned NameLen) { } } -bool +bool Path::isAbsolute() const { // FIXME: This does not handle correctly an absolute path starting from // a drive letter or in UNC format. @@ -174,9 +174,9 @@ Path::isAbsolute() const { default: return path[0] == '/' || (path[1] == ':' && path[2] == '/'); } -} +} -static Path *TempDirectory = NULL; +static Path *TempDirectory; Path Path::GetTemporaryDirectory(std::string* ErrMsg) { @@ -266,7 +266,7 @@ Path Path::GetCurrentDirectory() { char pathname[MAX_PATH]; ::GetCurrentDirectoryA(MAX_PATH,pathname); - return Path(pathname); + return Path(pathname); } /// GetMainExecutable - Return the path to the main executable, given the @@ -448,7 +448,7 @@ Path::getDirectoryContents(std::set<Path>& result, std::string* ErrMsg) const { MakeErrMsg(ErrMsg, path + ": can't get status of file"); return true; } - + if (!(fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { if (ErrMsg) *ErrMsg = path + ": not a directory"; @@ -617,7 +617,7 @@ Path::createDirectoryOnDisk(bool create_parents, std::string* ErrMsg) { *next = 0; if (!CreateDirectory(pathname, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) - return MakeErrMsg(ErrMsg, + return MakeErrMsg(ErrMsg, std::string(pathname) + ": Can't create directory: "); *next++ = '/'; } @@ -649,7 +649,7 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const { WIN32_FILE_ATTRIBUTE_DATA fi; if (!GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi)) return true; - + if (fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { // If it doesn't exist, we're done. if (!exists()) @@ -706,7 +706,7 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const { pathname[lastchar] = 0; if (!RemoveDirectory(pathname)) - return MakeErrMsg(ErrStr, + return MakeErrMsg(ErrStr, std::string(pathname) + ": Can't destroy directory: "); return false; } else { @@ -753,7 +753,7 @@ bool Path::getMagicNumber(std::string& Magic, unsigned len) const { bool Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) { if (!MoveFileEx(path.c_str(), newName.c_str(), MOVEFILE_REPLACE_EXISTING)) - return MakeErrMsg(ErrMsg, "Can't move '" + path + "' to '" + newName.path + return MakeErrMsg(ErrMsg, "Can't move '" + path + "' to '" + newName.path + "': "); return false; } @@ -764,7 +764,7 @@ Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrMsg) const { if (!si.isFile) { return true; } - + HANDLE h = CreateFile(path.c_str(), FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, |