Move default progress status format string into constant

ninja-build · Sep 22, 2024 · 57f6ed5 · 57f6ed5
1 parent 9df9b1c
commit 57f6ed5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/status_printer.cc b/src/status_printer.cc
@@ -42,12 +42,14 @@ Status* Status::factory(const BuildConfig& config) {
 
 StatusPrinter::StatusPrinter(const BuildConfig& config)
     : config_(config), started_edges_(0), finished_edges_(0), total_edges_(0),
-      running_edges_(0), progress_status_format_(NULL),
-      current_rate_(config.parallelism) {
+      running_edges_(0), current_rate_(config.parallelism) {
   // Don't do anything fancy in verbose mode.
   if (config_.verbosity != BuildConfig::NORMAL)
     printer_.set_smart_terminal(false);
 
+  // The progress status format to use by default
+  static const char kDefaultProgressStatusFormat[] = "[%f/%t] ";
+
   progress_status_format_ = getenv("NINJA_STATUS");
 
   std::string error_output;
@@ -57,7 +59,7 @@ StatusPrinter::StatusPrinter(const BuildConfig& config)
     progress_status_format_ = nullptr;
   }
   if (!progress_status_format_)
-    progress_status_format_ = "[%f/%t] ";
+    progress_status_format_ = kDefaultProgressStatusFormat;
 }
 
 void StatusPrinter::EdgeAddedToPlan(const Edge* edge) {

diff --git a/src/status_printer.h b/src/status_printer.h
@@ -100,7 +100,7 @@ struct StatusPrinter : Status {
   Explanations* explanations_ = nullptr;
 
   /// The custom progress status format to use.
-  const char* progress_status_format_;
+  const char* progress_status_format_ = nullptr;
 
   template <size_t S>
   void SnprintfRate(double rate, char (&buf)[S], const char* format) const {