6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-21 03:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Remove superfluous NULL assignment

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98350 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kovarththanan Rajaratnam 2010-03-12 14:17:24 +00:00
parent 018cbd5ddf
commit 16ceb3aaf7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/System/Win32/Path.inc
View File

@ -126,7 +126,7 @@ Path::isValid() const {
} }
void Path::makeAbsolute() { void Path::makeAbsolute() {
TCHAR FullPath[MAX_PATH + 1] = {0}; TCHAR FullPath[MAX_PATH + 1] = {0};
LPTSTR FilePart = NULL; LPTSTR FilePart = NULL;
DWORD RetLength = ::GetFullPathNameA(path.c_str(), DWORD RetLength = ::GetFullPathNameA(path.c_str(),
@ -161,7 +161,7 @@ Path::isAbsolute(const char *NameStart, unsigned NameLen) {
} }
} }
bool bool
Path::isAbsolute() const { Path::isAbsolute() const {
// FIXME: This does not handle correctly an absolute path starting from // FIXME: This does not handle correctly an absolute path starting from
// a drive letter or in UNC format. // a drive letter or in UNC format.
@ -174,9 +174,9 @@ Path::isAbsolute() const {
default: default:
return path[0] == '/' || (path[1] == ':' && path[2] == '/'); return path[0] == '/' || (path[1] == ':' && path[2] == '/');
} }
} }
static Path *TempDirectory = NULL; static Path *TempDirectory;
Path Path
Path::GetTemporaryDirectory(std::string* ErrMsg) { Path::GetTemporaryDirectory(std::string* ErrMsg) {
@ -266,7 +266,7 @@ Path
Path::GetCurrentDirectory() { Path::GetCurrentDirectory() {
char pathname[MAX_PATH]; char pathname[MAX_PATH];
::GetCurrentDirectoryA(MAX_PATH,pathname); ::GetCurrentDirectoryA(MAX_PATH,pathname);
return Path(pathname); return Path(pathname);
} }
/// GetMainExecutable - Return the path to the main executable, given the /// 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"); MakeErrMsg(ErrMsg, path + ": can't get status of file");
return true; return true;
} }
if (!(fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { if (!(fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
if (ErrMsg) if (ErrMsg)
*ErrMsg = path + ": not a directory"; *ErrMsg = path + ": not a directory";
@ -617,7 +617,7 @@ Path::createDirectoryOnDisk(bool create_parents, std::string* ErrMsg) {
*next = 0; *next = 0;
if (!CreateDirectory(pathname, NULL) && if (!CreateDirectory(pathname, NULL) &&
GetLastError() != ERROR_ALREADY_EXISTS) GetLastError() != ERROR_ALREADY_EXISTS)
return MakeErrMsg(ErrMsg, return MakeErrMsg(ErrMsg,
std::string(pathname) + ": Can't create directory: "); std::string(pathname) + ": Can't create directory: ");
*next++ = '/'; *next++ = '/';
} }
@ -649,7 +649,7 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const {
WIN32_FILE_ATTRIBUTE_DATA fi; WIN32_FILE_ATTRIBUTE_DATA fi;
if (!GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi)) if (!GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi))
return true; return true;
if (fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { if (fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
// If it doesn't exist, we're done. // If it doesn't exist, we're done.
if (!exists()) if (!exists())
@ -706,7 +706,7 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const {
pathname[lastchar] = 0; pathname[lastchar] = 0;
if (!RemoveDirectory(pathname)) if (!RemoveDirectory(pathname))
return MakeErrMsg(ErrStr, return MakeErrMsg(ErrStr,
std::string(pathname) + ": Can't destroy directory: "); std::string(pathname) + ": Can't destroy directory: ");
return false; return false;
} else { } else {
@ -753,7 +753,7 @@ bool Path::getMagicNumber(std::string& Magic, unsigned len) const {
bool bool
Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) { Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) {
if (!MoveFileEx(path.c_str(), newName.c_str(), MOVEFILE_REPLACE_EXISTING)) 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; return false;
} }
@ -764,7 +764,7 @@ Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrMsg) const {
if (!si.isFile) { if (!si.isFile) {
return true; return true;
} }
HANDLE h = CreateFile(path.c_str(), HANDLE h = CreateFile(path.c_str(),
FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,