echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-tidy: apply misc-suspicious-string-compare fixes

Browse Source
This commit is contained in:
Daniel Pfeifer 2016-12-10 16:49:34 +01:00 committed by Brad King
parent 58c66393cf
commit 88da3d68c2
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/CPack/cmCPackNSISGenerator.cxx
View File

@ -597,13 +597,11 @@ bool cmCPackNSISGenerator::GetListOfSubdirectories(
{ {
cmsys::Directory dir; cmsys::Directory dir;
dir.Load(topdir); dir.Load(topdir);
size_t fileNum; for (unsigned long i = 0; i < dir.GetNumberOfFiles(); ++i) {
for (fileNum = 0; fileNum < dir.GetNumberOfFiles(); ++fileNum) { const char* fileName = dir.GetFile(i);
if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), ".") && if (strcmp(fileName, ".") != 0 && strcmp(fileName, "..") != 0) {
strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), "..")) { std::string const fullPath =
std::string fullPath = topdir; std::string(topdir).append("/").append(fileName);
fullPath += "/";
fullPath += dir.GetFile(static_cast<unsigned long>(fileNum));
if (cmsys::SystemTools::FileIsDirectory(fullPath) && if (cmsys::SystemTools::FileIsDirectory(fullPath) &&
!cmsys::SystemTools::FileIsSymlink(fullPath)) { !cmsys::SystemTools::FileIsSymlink(fullPath)) {
if (!this->GetListOfSubdirectories(fullPath.c_str(), dirs)) { if (!this->GetListOfSubdirectories(fullPath.c_str(), dirs)) {

17
Source/cmCoreTryCompile.cxx
View File

@ -806,18 +806,13 @@ void cmCoreTryCompile::CleanupFiles(const char* binDir)
cmsys::Directory dir; cmsys::Directory dir;
dir.Load(binDir); dir.Load(binDir);
size_t fileNum;
std::set<std::string> deletedFiles; std::set<std::string> deletedFiles;
for (fileNum = 0; fileNum < dir.GetNumberOfFiles(); ++fileNum) { for (unsigned long i = 0; i < dir.GetNumberOfFiles(); ++i) {
if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), ".") && const char* fileName = dir.GetFile(i);
strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), "..")) { if (strcmp(fileName, ".") != 0 && strcmp(fileName, "..") != 0) {
if (deletedFiles.insert(fileName).second) {
if (deletedFiles.find(dir.GetFile( std::string const fullPath =
static_cast<unsigned long>(fileNum))) == deletedFiles.end()) { std::string(binDir).append("/").append(fileName);
deletedFiles.insert(dir.GetFile(static_cast<unsigned long>(fileNum)));
std::string fullPath = binDir;
fullPath += "/";
fullPath += dir.GetFile(static_cast<unsigned long>(fileNum));
if (cmSystemTools::FileIsDirectory(fullPath)) { if (cmSystemTools::FileIsDirectory(fullPath)) {
this->CleanupFiles(fullPath.c_str()); this->CleanupFiles(fullPath.c_str());
cmSystemTools::RemoveADirectory(fullPath); cmSystemTools::RemoveADirectory(fullPath);