diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-12 12:19:06 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-12 08:19:43 -0400 |
| commit | 3cf22df42eddd2bc1657fac0cb159f34c7ab6470 (patch) | |
| tree | b630f23bbfd0becd64e8e843c5978677ebe15da6 | |
| parent | c278b4eda9116e57e158e12aa8e836c3edc8fdf3 (diff) | |
| parent | 7a1cce210baad152c834b7497ea34f50f5177390 (diff) | |
| download | cmake-3cf22df42eddd2bc1657fac0cb159f34c7ab6470.tar.gz | |
Merge topic 'ctest-curl-debugfunction' into release-3.17
7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4459
| -rw-r--r-- | Source/CTest/cmCTestCurl.cxx | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx index 3ad474980c..69c57938fe 100644 --- a/Source/CTest/cmCTestCurl.cxx +++ b/Source/CTest/cmCTestCurl.cxx @@ -55,7 +55,7 @@ size_t curlDebugCallback(CURL* /*unused*/, curl_infotype /*unused*/, char* chPtr, size_t size, void* data) { cm::append(*static_cast<std::vector<char>*>(data), chPtr, chPtr + size); - return size; + return 0; } } diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index a8f201a8a8..22ab48f57e 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -110,7 +110,7 @@ static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL* /*unused*/, { cm::append(*static_cast<cmCTestSubmitHandlerVectorOfChar*>(data), chPtr, chPtr + size); - return size; + return 0; } cmCTestSubmitHandler::cmCTestSubmitHandler() |