echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmFileCommand: Clarify names and logic using optional<bool>

Browse Source
This commit is contained in:
Brad King 2024-09-23 14:37:29 -04:00
parent fdceee50e6
commit 03d37ae3ff
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CTestCustom.cmake.in
View File

@ -86,7 +86,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"[0-9]+ Warning\\(s\\) detected" # SunPro "[0-9]+ Warning\\(s\\) detected" # SunPro
# Ignore false positive on `cm::optional` usage from GCC # Ignore false positive on `cm::optional` usage from GCC
"cmFileCommand.cxx:[0-9]*:[0-9]*: warning: '\\*\\(\\(void\\*\\)& tls_verify \\+2\\)' may be used uninitialized in this function \\[-Wmaybe-uninitialized\\]" "cmFileCommand.cxx:[0-9]*:[0-9]*: warning: '\\*\\(\\(void\\*\\)& tlsVerifyOpt \\+2\\)' may be used uninitialized in this function \\[-Wmaybe-uninitialized\\]"
"cmGlobalNinjaGenerator.cxx:[0-9]*:[0-9]*: warning: '.*cm::optional<CxxModuleMapFormat>::_mem\\)\\)' may be used uninitialized \\[-Wmaybe-uninitialized\\]" "cmGlobalNinjaGenerator.cxx:[0-9]*:[0-9]*: warning: '.*cm::optional<CxxModuleMapFormat>::_mem\\)\\)' may be used uninitialized \\[-Wmaybe-uninitialized\\]"
"cmGlobalNinjaGenerator.cxx:[0-9]*:[0-9]*: note: '.*cm::optional<CxxModuleMapFormat>::_mem\\)\\)' was declared here" "cmGlobalNinjaGenerator.cxx:[0-9]*:[0-9]*: note: '.*cm::optional<CxxModuleMapFormat>::_mem\\)\\)' was declared here"
"cmGlobalNinjaGenerator.cxx:[0-9]*:[0-9]*: warning: '\\*\\(\\(void\\*\\)& modmap_fmt \\+4\\)' may be used uninitialized in this function \\[-Wmaybe-uninitialized\\]" "cmGlobalNinjaGenerator.cxx:[0-9]*:[0-9]*: warning: '\\*\\(\\(void\\*\\)& modmap_fmt \\+4\\)' may be used uninitialized in this function \\[-Wmaybe-uninitialized\\]"

72
Source/cmFileCommand.cxx
View File

@ -1932,8 +1932,8 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
long inactivity_timeout = 0; long inactivity_timeout = 0;
std::string logVar; std::string logVar;
std::string statusVar; std::string statusVar;
cm::optional<std::string> tls_version; cm::optional<std::string> tlsVersionOpt;
cm::optional<bool> tls_verify; cm::optional<bool> tlsVerifyOpt;
cmValue cainfo = status.GetMakefile().GetDefinition("CMAKE_TLS_CAINFO"); cmValue cainfo = status.GetMakefile().GetDefinition("CMAKE_TLS_CAINFO");
std::string netrc_level = std::string netrc_level =
status.GetMakefile().GetSafeDefinition("CMAKE_NETRC"); status.GetMakefile().GetSafeDefinition("CMAKE_NETRC");
@ -1982,7 +1982,7 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
} else if (*i == "TLS_VERSION") { } else if (*i == "TLS_VERSION") {
++i; ++i;
if (i != args.end()) { if (i != args.end()) {
tls_version = *i; tlsVersionOpt = *i;
} else { } else {
status.SetError("DOWNLOAD missing value for TLS_VERSION."); status.SetError("DOWNLOAD missing value for TLS_VERSION.");
return false; return false;
@ -1990,7 +1990,7 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
} else if (*i == "TLS_VERIFY") { } else if (*i == "TLS_VERIFY") {
++i; ++i;
if (i != args.end()) { if (i != args.end()) {
tls_verify = cmIsOn(*i); tlsVerifyOpt = cmIsOn(*i);
} else { } else {
status.SetError("DOWNLOAD missing bool value for TLS_VERIFY."); status.SetError("DOWNLOAD missing bool value for TLS_VERIFY.");
return false; return false;
@ -2098,27 +2098,27 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
++i; ++i;
} }
if (!tls_verify) { if (!tlsVerifyOpt.has_value()) {
if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERIFY")) { if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERIFY")) {
tls_verify = v.IsOn(); tlsVerifyOpt = v.IsOn();
} }
} }
if (!tls_verify) { if (!tlsVerifyOpt.has_value()) {
if (cm::optional<std::string> v = if (cm::optional<std::string> v =
cmSystemTools::GetEnvVar("CMAKE_TLS_VERIFY")) { cmSystemTools::GetEnvVar("CMAKE_TLS_VERIFY")) {
tls_verify = cmIsOn(*v); tlsVerifyOpt = cmIsOn(*v);
} }
} }
if (!tls_version) { if (!tlsVersionOpt.has_value()) {
if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERSION")) { if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERSION")) {
tls_version = *v; tlsVersionOpt = *v;
} }
} }
if (!tls_version) { if (!tlsVersionOpt.has_value()) {
if (cm::optional<std::string> v = if (cm::optional<std::string> v =
cmSystemTools::GetEnvVar("CMAKE_TLS_VERSION")) { cmSystemTools::GetEnvVar("CMAKE_TLS_VERSION")) {
tls_version = std::move(v); tlsVersionOpt = std::move(v);
} }
} }
@ -2202,21 +2202,21 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
cmFileCommandCurlDebugCallback); cmFileCommandCurlDebugCallback);
check_curl_result(res, "DOWNLOAD cannot set debug function: "); check_curl_result(res, "DOWNLOAD cannot set debug function: ");
if (tls_version) { if (tlsVersionOpt.has_value()) {
if (cm::optional<int> v = cmCurlParseTLSVersion(*tls_version)) { if (cm::optional<int> v = cmCurlParseTLSVersion(*tlsVersionOpt)) {
res = ::curl_easy_setopt(curl, CURLOPT_SSLVERSION, *v); res = ::curl_easy_setopt(curl, CURLOPT_SSLVERSION, *v);
check_curl_result( check_curl_result(res,
res, cmStrCat("DOWNLOAD cannot set TLS/SSL version ",
cmStrCat("DOWNLOAD cannot set TLS/SSL version ", *tls_version, ": ")); *tlsVersionOpt, ": "));
} else { } else {
status.SetError( status.SetError(
cmStrCat("DOWNLOAD given unknown TLS/SSL version ", *tls_version)); cmStrCat("DOWNLOAD given unknown TLS/SSL version ", *tlsVersionOpt));
return false; return false;
} }
} }
// check to see if TLS verification is requested // check to see if TLS verification is requested
if (tls_verify && *tls_verify) { if (tlsVerifyOpt.has_value() && tlsVerifyOpt.value()) {
res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1); res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
check_curl_result(res, "DOWNLOAD cannot set TLS/SSL Verify on: "); check_curl_result(res, "DOWNLOAD cannot set TLS/SSL Verify on: ");
} else { } else {
@ -2404,8 +2404,8 @@ bool HandleUploadCommand(std::vector<std::string> const& args,
std::string logVar; std::string logVar;
std::string statusVar; std::string statusVar;
bool showProgress = false; bool showProgress = false;
cm::optional<std::string> tls_version; cm::optional<std::string> tlsVersionOpt;
cm::optional<bool> tls_verify; cm::optional<bool> tlsVerifyOpt;
cmValue cainfo = status.GetMakefile().GetDefinition("CMAKE_TLS_CAINFO"); cmValue cainfo = status.GetMakefile().GetDefinition("CMAKE_TLS_CAINFO");
std::string userpwd; std::string userpwd;
std::string netrc_level = std::string netrc_level =
@ -2451,7 +2451,7 @@ bool HandleUploadCommand(std::vector<std::string> const& args,
} else if (*i == "TLS_VERSION") { } else if (*i == "TLS_VERSION") {
++i; ++i;
if (i != args.end()) { if (i != args.end()) {
tls_version = *i; tlsVersionOpt = *i;
} else { } else {
status.SetError("UPLOAD missing value for TLS_VERSION."); status.SetError("UPLOAD missing value for TLS_VERSION.");
return false; return false;
@ -2459,7 +2459,7 @@ bool HandleUploadCommand(std::vector<std::string> const& args,
} else if (*i == "TLS_VERIFY") { } else if (*i == "TLS_VERIFY") {
++i; ++i;
if (i != args.end()) { if (i != args.end()) {
tls_verify = cmIsOn(*i); tlsVerifyOpt = cmIsOn(*i);
} else { } else {
status.SetError("UPLOAD missing bool value for TLS_VERIFY."); status.SetError("UPLOAD missing bool value for TLS_VERIFY.");
return false; return false;
@ -2511,27 +2511,27 @@ bool HandleUploadCommand(std::vector<std::string> const& args,
++i; ++i;
} }
if (!tls_verify) { if (!tlsVerifyOpt.has_value()) {
if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERIFY")) { if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERIFY")) {
tls_verify = v.IsOn(); tlsVerifyOpt = v.IsOn();
} }
} }
if (!tls_verify) { if (!tlsVerifyOpt.has_value()) {
if (cm::optional<std::string> v = if (cm::optional<std::string> v =
cmSystemTools::GetEnvVar("CMAKE_TLS_VERIFY")) { cmSystemTools::GetEnvVar("CMAKE_TLS_VERIFY")) {
tls_verify = cmIsOn(*v); tlsVerifyOpt = cmIsOn(*v);
} }
} }
if (!tls_version) { if (!tlsVersionOpt.has_value()) {
if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERSION")) { if (cmValue v = status.GetMakefile().GetDefinition("CMAKE_TLS_VERSION")) {
tls_version = *v; tlsVersionOpt = *v;
} }
} }
if (!tls_version) { if (!tlsVersionOpt.has_value()) {
if (cm::optional<std::string> v = if (cm::optional<std::string> v =
cmSystemTools::GetEnvVar("CMAKE_TLS_VERSION")) { cmSystemTools::GetEnvVar("CMAKE_TLS_VERSION")) {
tls_version = std::move(v); tlsVersionOpt = std::move(v);
} }
} }
@ -2580,21 +2580,21 @@ bool HandleUploadCommand(std::vector<std::string> const& args,
cmFileCommandCurlDebugCallback); cmFileCommandCurlDebugCallback);
check_curl_result(res, "UPLOAD cannot set debug function: "); check_curl_result(res, "UPLOAD cannot set debug function: ");
if (tls_version) { if (tlsVersionOpt.has_value()) {
if (cm::optional<int> v = cmCurlParseTLSVersion(*tls_version)) { if (cm::optional<int> v = cmCurlParseTLSVersion(*tlsVersionOpt)) {
res = ::curl_easy_setopt(curl, CURLOPT_SSLVERSION, *v); res = ::curl_easy_setopt(curl, CURLOPT_SSLVERSION, *v);
check_curl_result( check_curl_result(
res, res,
cmStrCat("UPLOAD cannot set TLS/SSL version ", *tls_version, ": ")); cmStrCat("UPLOAD cannot set TLS/SSL version ", *tlsVersionOpt, ": "));
} else { } else {
status.SetError( status.SetError(
cmStrCat("UPLOAD given unknown TLS/SSL version ", *tls_version)); cmStrCat("UPLOAD given unknown TLS/SSL version ", *tlsVersionOpt));
return false; return false;
} }
} }
// check to see if TLS verification is requested // check to see if TLS verification is requested
if (tls_verify && *tls_verify) { if (tlsVerifyOpt.has_value() && tlsVerifyOpt.value()) {
res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1); res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
check_curl_result(res, "UPLOAD cannot set TLS/SSL Verify on: "); check_curl_result(res, "UPLOAD cannot set TLS/SSL Verify on: ");
} else { } else {