mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 04:09:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmCTestCurl: Clarify names and logic using optional<bool>

Browse Source
This commit is contained in:
Brad King
2024-09-23 14:39:58 -04:00
parent 03d37ae3ff
commit dcaea54898
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmCTestCurl.cxx
+2 -2
View File
@@ -84,11 +84,11 @@ bool cmCTestCurl::InitCurl()
return false; return false;
} }
cmCurlSetCAInfo(this->Curl); cmCurlSetCAInfo(this->Curl);
if (this->CurlOpts.TLSVersionOpt) { if (this->CurlOpts.TLSVersionOpt.has_value()) {
curl_easy_setopt(this->Curl, CURLOPT_SSLVERSION, curl_easy_setopt(this->Curl, CURLOPT_SSLVERSION,
*this->CurlOpts.TLSVersionOpt); *this->CurlOpts.TLSVersionOpt);
} }
if (this->CurlOpts.TLSVerifyOpt) { if (this->CurlOpts.TLSVerifyOpt.has_value()) {
curl_easy_setopt(this->Curl, CURLOPT_SSL_VERIFYPEER, curl_easy_setopt(this->Curl, CURLOPT_SSL_VERIFYPEER,
*this->CurlOpts.TLSVerifyOpt ? 1 : 0); *this->CurlOpts.TLSVerifyOpt ? 1 : 0);
} }
Source/CTest/cmCTestSubmitHandler.cxx
+2 -2
View File
@@ -181,7 +181,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(
curl = cm_curl_easy_init(); curl = cm_curl_easy_init();
if (curl) { if (curl) {
cmCurlSetCAInfo(curl); cmCurlSetCAInfo(curl);
if (curlOpts.TLSVersionOpt) { if (curlOpts.TLSVersionOpt.has_value()) {
cm::optional<std::string> tlsVersionStr = cm::optional<std::string> tlsVersionStr =
cmCurlPrintTLSVersion(*curlOpts.TLSVersionOpt); cmCurlPrintTLSVersion(*curlOpts.TLSVersionOpt);
cmCTestOptionalLog( cmCTestOptionalLog(
@@ -191,7 +191,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(
this->Quiet); this->Quiet);
curl_easy_setopt(curl, CURLOPT_SSLVERSION, *curlOpts.TLSVersionOpt); curl_easy_setopt(curl, CURLOPT_SSLVERSION, *curlOpts.TLSVersionOpt);
} }
if (curlOpts.TLSVerifyOpt) { if (curlOpts.TLSVerifyOpt.has_value()) {
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
" Set CURLOPT_SSL_VERIFYPEER to " " Set CURLOPT_SSL_VERIFYPEER to "
<< (*curlOpts.TLSVerifyOpt ? "on" : "off") << (*curlOpts.TLSVerifyOpt ? "on" : "off")