Sfoglia il codice sorgente

Refactor: Eliminate sequential calls to `cmSystemTools::Stdout`

Alex Turbov 1 anno fa
parent
commit
3855131c53

+ 1 - 3
Source/cmExecProgramCommand.cxx

@@ -202,9 +202,7 @@ bool RunCommand(std::string command, std::string& output, int& retVal,
 #  endif
   command = commandInDir;
   if (verbose) {
-    cmSystemTools::Stdout("running ");
-    cmSystemTools::Stdout(command);
-    cmSystemTools::Stdout("\n");
+    cmSystemTools::Stdout(cmStrCat("running ", command, '\n'));
   }
   fflush(stdout);
   fflush(stderr);

+ 1 - 1
Source/cmInstallScriptHandler.cxx

@@ -153,7 +153,7 @@ void InstallScript::start(cm::uv_loop_ptr& loop,
 
 void InstallScript::printResult(std::size_t n, std::size_t total)
 {
-  cmSystemTools::Stdout(cmStrCat("[", n, "/", total, "] ", this->name, "\n"));
+  cmSystemTools::Stdout(cmStrCat('[', n, '/', total, "] ", this->name, '\n'));
   for (auto const& line : this->output) {
     cmSystemTools::Stdout(line);
   }

+ 3 - 4
Source/cmSystemTools.cxx

@@ -2140,15 +2140,14 @@ bool extract_tar(const std::string& outFileName,
 
     if (verbose) {
       if (extract) {
-        cmSystemTools::Stdout("x ");
-        cmSystemTools::Stdout(cm_archive_entry_pathname(entry));
+        cmSystemTools::Stdout(
+          cmStrCat("x ", cm_archive_entry_pathname(entry)));
       } else {
         list_item_verbose(stdout, entry);
       }
       cmSystemTools::Stdout("\n");
     } else if (!extract) {
-      cmSystemTools::Stdout(cm_archive_entry_pathname(entry));
-      cmSystemTools::Stdout("\n");
+      cmSystemTools::Stdout(cmStrCat(cm_archive_entry_pathname(entry), '\n'));
     }
     if (extract) {
       if (extractTimestamps == cmSystemTools::cmTarExtractTimestamps::Yes) {