From 6550682b49cf5f0cc980f278fcd7bc89e674aa8f Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 16 Jan 2024 22:10:34 +0100 Subject: [PATCH] Codechange: minor bits and pieces related to fmt::format() (#11806) - Don't make run-time formatting what can be done compile-time. - Be explicit about run-time formatting. - Fix datetime printing. --- src/debug.cpp | 2 +- src/gamelog.cpp | 6 +++++- src/network/core/address.cpp | 2 +- src/newgrf_profiling.cpp | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/debug.cpp b/src/debug.cpp index de70791808..6bc66532da 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -95,7 +95,7 @@ void DumpDebugFacilityNames(std::back_insert_iterator &output_itera } else { fmt::format_to(output_iterator, ", "); } - fmt::format_to(output_iterator, i->name); + fmt::format_to(output_iterator, "{}", i->name); written = true; } if (written) { diff --git a/src/gamelog.cpp b/src/gamelog.cpp index 6ed62159df..7555380342 100644 --- a/src/gamelog.cpp +++ b/src/gamelog.cpp @@ -242,7 +242,11 @@ void Gamelog::Print(std::function proc) { /* A NewGRF got removed from the game, either manually or by it missing when loading the game. */ auto gm = grf_names.find(this->grfid); - fmt::format_to(output_iterator, action_type == GLAT_LOAD ? "Missing NewGRF: " : "Removed NewGRF: "); + if (action_type == GLAT_LOAD) { + fmt::format_to(output_iterator, "Missing NewGRF: "); + } else { + fmt::format_to(output_iterator, "Removed NewGRF: "); + } AddGrfInfo(output_iterator, this->grfid, nullptr, gm != grf_names.end() ? gm->second.gc : nullptr); if (gm == grf_names.end()) { fmt::format_to(output_iterator, ". Gamelog inconsistency: GrfID was never added!"); diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp index 81a072c6e0..525edd511d 100644 --- a/src/network/core/address.cpp +++ b/src/network/core/address.cpp @@ -93,7 +93,7 @@ static const char *GetAddressFormatString(uint16_t family, bool with_family) */ std::string NetworkAddress::GetAddressAsString(bool with_family) { - return fmt::format(GetAddressFormatString(this->GetAddress()->ss_family, with_family), this->GetHostname(), this->GetPort()); + return fmt::format(fmt::runtime(GetAddressFormatString(this->GetAddress()->ss_family, with_family)), this->GetHostname(), this->GetPort()); } /** diff --git a/src/newgrf_profiling.cpp b/src/newgrf_profiling.cpp index 221d07f2f8..115dd88b2d 100644 --- a/src/newgrf_profiling.cpp +++ b/src/newgrf_profiling.cpp @@ -131,7 +131,7 @@ void NewGRFProfiler::Abort() */ std::string NewGRFProfiler::GetOutputFilename() const { - return fmt::format("{}grfprofile-{%Y%m%d-%H%M}-{:08X}.csv", FiosGetScreenshotDir(), fmt::localtime(time(nullptr)), BSWAP32(this->grffile->grfid)); + return fmt::format("{}grfprofile-{:%Y%m%d-%H%M}-{:08X}.csv", FiosGetScreenshotDir(), fmt::localtime(time(nullptr)), BSWAP32(this->grffile->grfid)); } /* static */ uint32_t NewGRFProfiler::FinishAll()