echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CTest/cmCTestCurl.cxx
View File

@ -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);
}

4
Source/CTest/cmCTestSubmitHandler.cxx
View File

@ -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")