From 6ea9076048028a4adfdbdd2606698bffc81203d3 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Sun, 7 Apr 2024 08:38:44 -0700 Subject: Rework logger to create compile time errors The logger changes to move to std::format incidentally caused format errors to no longer be flagged at compile time. The example here[1] shows that the latest gcc/c++ gave us a way to solve this, using std::format_string. This incidentally shows two places where we got the format arguments wrong, so fix them. [1] https://stackoverflow.com/questions/72795189/how-can-i-wrap-stdformat-with-my-own-template-function Change-Id: Id884200e2c98eeaf5ef8db6c1d6362ede2ffb858 Signed-off-by: Ed Tanous --- http/routing.hpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'http/routing.hpp') diff --git a/http/routing.hpp b/http/routing.hpp index 7872b76cb5..a9884667d0 100644 --- a/http/routing.hpp +++ b/http/routing.hpp @@ -303,24 +303,24 @@ class Trie private: void debugNodePrint(Node* n, size_t level) { + std::string indent(2U * level, ' '); for (size_t i = 0; i < static_cast(ParamType::MAX); i++) { if (n->paramChildrens[i] != 0U) { - BMCWEB_LOG_DEBUG( - "{}({}{}", - std::string(2U * level, - ' ') /*, n->paramChildrens[i], ") "*/); switch (static_cast(i)) { case ParamType::STRING: - BMCWEB_LOG_DEBUG(""); + BMCWEB_LOG_DEBUG("{}({}) ", indent, + n->paramChildrens[i]); break; case ParamType::PATH: + BMCWEB_LOG_DEBUG("{}({}) ", indent, + n->paramChildrens[i]); BMCWEB_LOG_DEBUG(""); break; default: - BMCWEB_LOG_DEBUG(""); + BMCWEB_LOG_DEBUG("{}", indent); break; } @@ -329,9 +329,7 @@ class Trie } for (const Node::ChildMap::value_type& kv : n->children) { - BMCWEB_LOG_DEBUG("{}({}{}{}", - std::string(2U * level, ' ') /*, kv.second, ") "*/, - kv.first); + BMCWEB_LOG_DEBUG("{}({}{}) ", indent, kv.second, kv.first); debugNodePrint(&nodes[kv.second], level + 1); } } -- cgit v1.2.3