diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-05-26 20:52:22 (GMT) |
---|---|---|
committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-05-26 20:52:22 (GMT) |
commit | 1b2bb93302116a4791cf82e9cce028dfe87ef55d (patch) | |
tree | b20aead9b34d9bdba3243439dd8f0aed032727e2 /Source/CTest | |
parent | acd8a73044e879286f0cfa24b54497a8307f204b (diff) | |
download | CMake-1b2bb93302116a4791cf82e9cce028dfe87ef55d.zip CMake-1b2bb93302116a4791cf82e9cce028dfe87ef55d.tar.gz CMake-1b2bb93302116a4791cf82e9cce028dfe87ef55d.tar.bz2 |
Remove redundant c_str() calls.
Run clang-tidy's readability-redundant-string-cstr checker.
Ignore findings in kwsys.
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestGenericHandler.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 22 | ||||
-rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 4 | ||||
-rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmParseBlanketJSCoverage.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmParseGTMCoverage.cxx | 2 |
7 files changed, 15 insertions, 21 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 51456ed..7f0bf2c 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -1622,7 +1622,7 @@ bool cmCTestCoverageHandler::FindLCovFiles(std::vector<std::string>& files) return false; } - prevBinaryDir = cmSystemTools::GetCurrentWorkingDirectory().c_str(); + prevBinaryDir = cmSystemTools::GetCurrentWorkingDirectory(); // DPI file should appear in build directory std::string daGlob; diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index 1c80acd..18caabe 100644 --- a/Source/CTest/cmCTestGenericHandler.cxx +++ b/Source/CTest/cmCTestGenericHandler.cxx @@ -68,7 +68,7 @@ void cmCTestGenericHandler::Initialize() t_StringToString::iterator it; for (it = this->PersistentOptions.begin(); it != this->PersistentOptions.end(); ++it) { - this->Options[it->first] = it->second.c_str(); + this->Options[it->first] = it->second; } } diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 2cbd64d..5ae98af 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -422,7 +422,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() if (cmSystemTools::FileExists( this->CTest->GetCTestConfiguration("MemoryCheckCommand").c_str())) { this->MemoryTester = - this->CTest->GetCTestConfiguration("MemoryCheckCommand").c_str(); + this->CTest->GetCTestConfiguration("MemoryCheckCommand"); std::string testerName = cmSystemTools::GetFilenameName(this->MemoryTester); // determine the checker type @@ -438,47 +438,41 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() } } else if (cmSystemTools::FileExists( this->CTest->GetCTestConfiguration("PurifyCommand").c_str())) { - this->MemoryTester = - this->CTest->GetCTestConfiguration("PurifyCommand").c_str(); + this->MemoryTester = this->CTest->GetCTestConfiguration("PurifyCommand"); this->MemoryTesterStyle = cmCTestMemCheckHandler::PURIFY; } else if (cmSystemTools::FileExists( this->CTest->GetCTestConfiguration("ValgrindCommand") .c_str())) { - this->MemoryTester = - this->CTest->GetCTestConfiguration("ValgrindCommand").c_str(); + this->MemoryTester = this->CTest->GetCTestConfiguration("ValgrindCommand"); this->MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND; } else if (cmSystemTools::FileExists( this->CTest->GetCTestConfiguration("BoundsCheckerCommand") .c_str())) { this->MemoryTester = - this->CTest->GetCTestConfiguration("BoundsCheckerCommand").c_str(); + this->CTest->GetCTestConfiguration("BoundsCheckerCommand"); this->MemoryTesterStyle = cmCTestMemCheckHandler::BOUNDS_CHECKER; } if (this->CTest->GetCTestConfiguration("MemoryCheckType") == "AddressSanitizer") { - this->MemoryTester = - this->CTest->GetCTestConfiguration("CMakeCommand").c_str(); + this->MemoryTester = this->CTest->GetCTestConfiguration("CMakeCommand"); this->MemoryTesterStyle = cmCTestMemCheckHandler::ADDRESS_SANITIZER; this->LogWithPID = true; // even if we give the log file the pid is added } if (this->CTest->GetCTestConfiguration("MemoryCheckType") == "ThreadSanitizer") { - this->MemoryTester = - this->CTest->GetCTestConfiguration("CMakeCommand").c_str(); + this->MemoryTester = this->CTest->GetCTestConfiguration("CMakeCommand"); this->MemoryTesterStyle = cmCTestMemCheckHandler::THREAD_SANITIZER; this->LogWithPID = true; // even if we give the log file the pid is added } if (this->CTest->GetCTestConfiguration("MemoryCheckType") == "MemorySanitizer") { - this->MemoryTester = - this->CTest->GetCTestConfiguration("CMakeCommand").c_str(); + this->MemoryTester = this->CTest->GetCTestConfiguration("CMakeCommand"); this->MemoryTesterStyle = cmCTestMemCheckHandler::MEMORY_SANITIZER; this->LogWithPID = true; // even if we give the log file the pid is added } if (this->CTest->GetCTestConfiguration("MemoryCheckType") == "UndefinedBehaviorSanitizer") { - this->MemoryTester = - this->CTest->GetCTestConfiguration("CMakeCommand").c_str(); + this->MemoryTester = this->CTest->GetCTestConfiguration("CMakeCommand"); this->MemoryTesterStyle = cmCTestMemCheckHandler::UB_SANITIZER; this->LogWithPID = true; // even if we give the log file the pid is added } diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 59383af..9dda865 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -424,7 +424,7 @@ bool cmCTestRunTest::StartTest(size_t total) this->TestResult.Status = cmCTestTestHandler::BAD_COMMAND; this->TestResult.TestCount = this->TestProperties->Index; this->TestResult.Name = this->TestProperties->Name; - this->TestResult.Path = this->TestProperties->Directory.c_str(); + this->TestResult.Path = this->TestProperties->Directory; if (args.size() >= 2 && args[1] == "NOT_AVAILABLE") { this->TestProcess = new cmProcess; @@ -502,7 +502,7 @@ void cmCTestRunTest::ComputeArguments() if (this->TestHandler->MemCheck) { cmCTestMemCheckHandler* handler = static_cast<cmCTestMemCheckHandler*>(this->TestHandler); - this->ActualCommand = handler->MemoryTester.c_str(); + this->ActualCommand = handler->MemoryTester; this->TestProperties->Args[1] = this->TestHandler->FindTheExecutable( this->TestProperties->Args[1].c_str()); } else { diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index ba0e816..6389a9d 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -485,7 +485,7 @@ int cmCTestScriptHandler::ExtractVariables() // if the dashboard root isn't specified then we can compute it from the // this->SourceDir if (this->CTestRoot.empty()) { - this->CTestRoot = cmSystemTools::GetFilenamePath(this->SourceDir).c_str(); + this->CTestRoot = cmSystemTools::GetFilenamePath(this->SourceDir); } // the script may override the minimum continuous interval diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx index 1e42847..152c354 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -74,7 +74,7 @@ public: } foundFile = true; inSource = false; - filename = getValue(line, 0).c_str(); + filename = getValue(line, 0); } else if ((line.find("coverage") != line.npos) && foundFile && inSource) { /* diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx index a065903..33ad839 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -121,7 +121,7 @@ bool cmParseGTMCoverage::FindFunctionInMumpsFile(std::string const& filepath, std::string line; int linenum = 0; while (cmSystemTools::GetLineFromStream(in, line)) { - std::string::size_type pos = line.find(function.c_str()); + std::string::size_type pos = line.find(function); if (pos == 0) { char nextchar = line[function.size()]; if (nextchar == ' ' || nextchar == '(' || nextchar == '\t') { |