diff options
author | Brad King <brad.king@kitware.com> | 2015-05-28 14:33:44 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-05-28 14:33:44 (GMT) |
commit | 0d37dcd33534be17ac0ae13cb59b18743dbdb4f1 (patch) | |
tree | 946847d5e2e3ca611df2ab9f25f284e64a4d70af /Source/cmFileCommand.cxx | |
parent | 43c01e07504e2ab61e7a30b428c1c9601791f948 (diff) | |
download | CMake-0d37dcd33534be17ac0ae13cb59b18743dbdb4f1.zip CMake-0d37dcd33534be17ac0ae13cb59b18743dbdb4f1.tar.gz CMake-0d37dcd33534be17ac0ae13cb59b18743dbdb4f1.tar.bz2 |
cmFileCommand: Rename variable verboseLog => logVar
This makes the LOG variable name consistent between UPLOAD and DOWNLOAD
implementations.
Diffstat (limited to 'Source/cmFileCommand.cxx')
-rw-r--r-- | Source/cmFileCommand.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index f0d0286..984989e 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2963,7 +2963,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args) long timeout = 0; long inactivity_timeout = 0; - std::string verboseLog; + std::string logVar; std::string statusVar; bool tls_verify = this->Makefile->IsOn("CMAKE_TLS_VERIFY"); const char* cainfo = this->Makefile->GetDefinition("CMAKE_TLS_CAINFO"); @@ -3008,7 +3008,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args) this->SetError("DOWNLOAD missing VAR for LOG."); return false; } - verboseLog = *i; + logVar = *i; } else if(*i == "STATUS") { @@ -3200,7 +3200,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args) res = ::curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); check_curl_result(res, "DOWNLOAD cannot set follow-redirect option: "); - if(!verboseLog.empty()) + if(!logVar.empty()) { res = ::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); check_curl_result(res, "DOWNLOAD cannot set verbose: "); @@ -3290,8 +3290,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args) if(!chunkDebug.empty()) { chunkDebug.push_back(0); - this->Makefile->AddDefinition(verboseLog, - &*chunkDebug.begin()); + this->Makefile->AddDefinition(logVar, &*chunkDebug.begin()); } return true; |