diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-23 16:26:55 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2014-12-26 15:23:35 (GMT) |
| commit | 0bdd4ebfb8303cc46e4a8bbe16f6c7bcc7108e2a (patch) | |
| tree | 55e9a2deffd66d0c1b861a640c2739c5088501f9 | |
| parent | a9fae8ac1d952ffd3b54de6082f9729466101bb0 (diff) | |
| download | CMake-0bdd4ebfb8303cc46e4a8bbe16f6c7bcc7108e2a.zip CMake-0bdd4ebfb8303cc46e4a8bbe16f6c7bcc7108e2a.tar.gz CMake-0bdd4ebfb8303cc46e4a8bbe16f6c7bcc7108e2a.tar.bz2 | |
cmCTest: Use size_t for cmsysBase64_Encode return value
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 4 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 5 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 9e3c9fc..ff55528 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -116,10 +116,10 @@ void cmCTestRunTest::CompressOutput() unsigned char *encoded_buffer = new unsigned char[static_cast<int>(outSize * 1.5)]; - unsigned long rlen + size_t rlen = cmsysBase64_Encode(out, strm.total_out, encoded_buffer, 1); - for(unsigned long i = 0; i < rlen; i++) + for(size_t i = 0; i < rlen; i++) { this->CompressedOutput += encoded_buffer[i]; } diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index f330e58..8518a90 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1976,9 +1976,8 @@ std::string cmCTestTestHandler::GenerateRegressionImages( = new unsigned char [ static_cast<int>( static_cast<double>(len) * 1.5 + 5.0) ]; - unsigned long rlen + size_t rlen = cmsysBase64_Encode(file_buffer, len, encoded_buffer, 1); - unsigned long cc; ostr << "\t\t\t<NamedMeasurement" @@ -1988,7 +1987,7 @@ std::string cmCTestTestHandler::GenerateRegressionImages( << measurementfile.match(4) << "\"" << " encoding=\"base64\"" << ">" << std::endl << "\t\t\t\t<Value>"; - for ( cc = 0; cc < rlen; cc ++ ) + for (size_t cc = 0; cc < rlen; cc ++ ) { ostr << encoded_buffer[cc]; if ( cc % 60 == 0 && cc ) diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 814c4e0..1362a50 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1701,11 +1701,11 @@ std::string cmCTest::Base64EncodeFile(std::string file) unsigned char *encoded_buffer = new unsigned char [ (len * 3) / 2 + 5 ]; - unsigned long rlen + size_t const rlen = cmsysBase64_Encode(file_buffer, len, encoded_buffer, 1); std::string base64 = ""; - for(unsigned long i = 0; i < rlen; i++) + for(size_t i = 0; i < rlen; i++) { base64 += encoded_buffer[i]; } @@ -3193,7 +3193,7 @@ bool cmCTest::CompressString(std::string& str) unsigned char* base64EncodedBuffer = new unsigned char[(outSize * 3) / 2]; - unsigned long rlen + size_t rlen = cmsysBase64_Encode(out, strm.total_out, base64EncodedBuffer, 1); str = ""; |