summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-12-10 15:55:49 (GMT)
committerBrad King <brad.king@kitware.com>2016-12-12 19:04:16 (GMT)
commitb932cd429800bb24d71e1d60f954fe4df2d1eb5c (patch)
tree84d42b0bd94f5dc5085ea76fb13ec1b8a4dd0f1c
parent88da3d68c2d205688762fd6a7e84fd730533e844 (diff)
downloadCMake-b932cd429800bb24d71e1d60f954fe4df2d1eb5c.zip
CMake-b932cd429800bb24d71e1d60f954fe4df2d1eb5c.tar.gz
CMake-b932cd429800bb24d71e1d60f954fe4df2d1eb5c.tar.bz2
clang-tidy: apply misc-redundant-expression fixes
-rw-r--r--Source/CTest/cmCTestRunTest.cxx5
-rw-r--r--Source/cmCTest.cxx2
-rw-r--r--Source/cmDocumentationFormatter.cxx2
3 files changed, 4 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index fbc94cc..5c45fe5 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -119,10 +119,9 @@ void cmCTestRunTest::CompressOutput()
strm.next_out = out;
ret = deflate(&strm, Z_FINISH);
- if (ret == Z_STREAM_ERROR || ret != Z_STREAM_END) {
+ if (ret != Z_STREAM_END) {
cmCTestLog(this->CTest, ERROR_MESSAGE,
- "Error during output "
- "compression. Sending uncompressed output."
+ "Error during output compression. Sending uncompressed output."
<< std::endl);
delete[] out;
return;
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index dfec0fb..559275e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2787,7 +2787,7 @@ bool cmCTest::CompressString(std::string& str)
strm.next_out = &out[0];
ret = deflate(&strm, Z_FINISH);
- if (ret == Z_STREAM_ERROR || ret != Z_STREAM_END) {
+ if (ret != Z_STREAM_END) {
cmCTestLog(this, ERROR_MESSAGE, "Error during gzip compression."
<< std::endl);
return false;
diff --git a/Source/cmDocumentationFormatter.cxx b/Source/cmDocumentationFormatter.cxx
index 21a5209..0018263 100644
--- a/Source/cmDocumentationFormatter.cxx
+++ b/Source/cmDocumentationFormatter.cxx
@@ -156,7 +156,7 @@ void cmDocumentationFormatter::PrintColumn(std::ostream& os, const char* text)
// Move to beginning of next word. Skip over whitespace.
l = r;
- while (*l && (*l == ' ')) {
+ while (*l == ' ') {
++l;
}
}