diff options
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 12 | ||||
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 17 |
2 files changed, 11 insertions, 18 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 2c9ca63..1940953 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -597,13 +597,11 @@ bool cmCPackNSISGenerator::GetListOfSubdirectories( { cmsys::Directory dir; dir.Load(topdir); - size_t fileNum; - for (fileNum = 0; fileNum < dir.GetNumberOfFiles(); ++fileNum) { - if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), ".") && - strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), "..")) { - std::string fullPath = topdir; - fullPath += "/"; - fullPath += dir.GetFile(static_cast<unsigned long>(fileNum)); + for (unsigned long i = 0; i < dir.GetNumberOfFiles(); ++i) { + const char* fileName = dir.GetFile(i); + if (strcmp(fileName, ".") != 0 && strcmp(fileName, "..") != 0) { + std::string const fullPath = + std::string(topdir).append("/").append(fileName); if (cmsys::SystemTools::FileIsDirectory(fullPath) && !cmsys::SystemTools::FileIsSymlink(fullPath)) { if (!this->GetListOfSubdirectories(fullPath.c_str(), dirs)) { diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index e0b3120..f12c9e8 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -806,18 +806,13 @@ void cmCoreTryCompile::CleanupFiles(const char* binDir) cmsys::Directory dir; dir.Load(binDir); - size_t fileNum; std::set<std::string> deletedFiles; - for (fileNum = 0; fileNum < dir.GetNumberOfFiles(); ++fileNum) { - if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), ".") && - strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), "..")) { - - if (deletedFiles.find(dir.GetFile( - static_cast<unsigned long>(fileNum))) == deletedFiles.end()) { - deletedFiles.insert(dir.GetFile(static_cast<unsigned long>(fileNum))); - std::string fullPath = binDir; - fullPath += "/"; - fullPath += dir.GetFile(static_cast<unsigned long>(fileNum)); + for (unsigned long i = 0; i < dir.GetNumberOfFiles(); ++i) { + const char* fileName = dir.GetFile(i); + if (strcmp(fileName, ".") != 0 && strcmp(fileName, "..") != 0) { + if (deletedFiles.insert(fileName).second) { + std::string const fullPath = + std::string(binDir).append("/").append(fileName); if (cmSystemTools::FileIsDirectory(fullPath)) { this->CleanupFiles(fullPath.c_str()); cmSystemTools::RemoveADirectory(fullPath); |