From 57f6ed5e72fc7ebc5125128792d1bcc0c7befc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Harald=20J=C3=B8rgensen?= <58829763+adamjoer@users.noreply.github.com> Date: Thu, 19 Sep 2024 23:11:27 +0200 Subject: [PATCH] Move default progress status format string into constant --- src/status_printer.cc | 8 +++++--- src/status_printer.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/status_printer.cc b/src/status_printer.cc index cdc6cb8ec4..412bb61b5b 100644 --- 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 index b4f775a642..ddf74fe186 100644 --- 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 void SnprintfRate(double rate, char (&buf)[S], const char* format) const {