diff options
| author | Brad King <brad.king@kitware.com> | 2024-09-23 18:39:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-09-24 12:37:23 (GMT) |
| commit | dcaea54898cccb9ac1f675a395ac1793d1abfcfc (patch) | |
| tree | b49b6a27f9631541295ad442d3d8e6edb7df21e7 | |
| parent | 03d37ae3ffa1eb937bfaddfa07e51ef2e84aa7d2 (diff) | |
| download | CMake-dcaea54898cccb9ac1f675a395ac1793d1abfcfc.zip CMake-dcaea54898cccb9ac1f675a395ac1793d1abfcfc.tar.gz CMake-dcaea54898cccb9ac1f675a395ac1793d1abfcfc.tar.bz2 | |
cmCTestCurl: Clarify names and logic using optional<bool>
| -rw-r--r-- | Source/CTest/cmCTestCurl.cxx | 4 | ||||
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx index 7137e63..6f887f3 100644 --- a/Source/CTest/cmCTestCurl.cxx +++ b/Source/CTest/cmCTestCurl.cxx @@ -84,11 +84,11 @@ bool cmCTestCurl::InitCurl() return false; } cmCurlSetCAInfo(this->Curl); - if (this->CurlOpts.TLSVersionOpt) { + if (this->CurlOpts.TLSVersionOpt.has_value()) { curl_easy_setopt(this->Curl, CURLOPT_SSLVERSION, *this->CurlOpts.TLSVersionOpt); } - if (this->CurlOpts.TLSVerifyOpt) { + if (this->CurlOpts.TLSVerifyOpt.has_value()) { curl_easy_setopt(this->Curl, CURLOPT_SSL_VERIFYPEER, *this->CurlOpts.TLSVerifyOpt ? 1 : 0); } diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index f05b874..91dea55 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -181,7 +181,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( curl = cm_curl_easy_init(); if (curl) { cmCurlSetCAInfo(curl); - if (curlOpts.TLSVersionOpt) { + if (curlOpts.TLSVersionOpt.has_value()) { cm::optional<std::string> tlsVersionStr = cmCurlPrintTLSVersion(*curlOpts.TLSVersionOpt); cmCTestOptionalLog( @@ -191,7 +191,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( this->Quiet); curl_easy_setopt(curl, CURLOPT_SSLVERSION, *curlOpts.TLSVersionOpt); } - if (curlOpts.TLSVerifyOpt) { + if (curlOpts.TLSVerifyOpt.has_value()) { cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " Set CURLOPT_SSL_VERIFYPEER to " << (*curlOpts.TLSVerifyOpt ? "on" : "off") |