Переглянути джерело

cmFileCommand: Rename variable verboseLog => logVar

This makes the LOG variable name consistent between UPLOAD and DOWNLOAD
implementations.
Brad King 10 роки тому
батько
коміт
0d37dcd335
1 змінених файлів з 4 додано та 5 видалено
  1. 4 5
      Source/cmFileCommand.cxx

+ 4 - 5
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;