diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 5e7e1f78..77744810 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -94,7 +94,7 @@ static const char *level_names[] SPDLOG_LEVEL_NAMES; static const char *short_level_names[]{"T", "D", "I", "W", "E", "C", "O"}; -inline const char *to_str(spdlog::level::level_enum l) +inline const char *to_c_str(spdlog::level::level_enum l) { return level_names[l]; } diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h index 9f356a7d..b55bfb9b 100644 --- a/include/spdlog/details/fmt_helper.h +++ b/include/spdlog/details/fmt_helper.h @@ -10,7 +10,7 @@ namespace details { namespace fmt_helper { inline void append_str(const std::string &str, fmt::memory_buffer &dest) { - const char *str_ptr = str.data(); + auto *str_ptr = str.data(); dest.append(str_ptr, str_ptr + str.size()); } diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h index 942421eb..611d7363 100644 --- a/include/spdlog/details/pattern_formatter_impl.h +++ b/include/spdlog/details/pattern_formatter_impl.h @@ -47,7 +47,7 @@ class level_formatter : public flag_formatter { void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { - fmt_helper::append_c_str(level::to_str(msg.level), dest); + fmt_helper::append_c_str(level::to_c_str(msg.level), dest); } }; @@ -390,7 +390,7 @@ class i_formatter SPDLOG_FINAL : public flag_formatter { void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { - // fmt::format_to(dest, "{:06}", msg.msg_id); + fmt_helper::pad6(msg.msg_id, dest); } }; @@ -509,7 +509,7 @@ class full_formatter SPDLOG_FINAL : public flag_formatter dest.push_back('['); // wrap the level name with color msg.color_range_start = dest.size(); - fmt_helper::append_c_str(level::to_str(msg.level), dest); + fmt_helper::append_c_str(level::to_c_str(msg.level), dest); msg.color_range_end = dest.size(); dest.push_back(']'); dest.push_back(' ');