Fixed GMT offset test

Apple platforms have had the tm_gmtoff-field at least since Mac OS X 10.0,
as are POSIX.1-2024 conforming systems, which are also required to support
it.

This has the unfortunate effect to use the SunOS/Solaris fallback, which
doesn't compute the correct value if the passed value of tm isn't the
current system time, i.e. localtime(::time()) (#3351).

CMakeLists.txt

@@ -33,6 +33,7 @@ elseif(NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif ()
 
+
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 if (CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR CMAKE_SYSTEM_NAME MATCHES "MSYS" OR CMAKE_SYSTEM_NAME MATCHES "MINGW")
@@ -290,12 +291,11 @@ if(MSVC)
     target_compile_options(spdlog PRIVATE "/Zc:__cplusplus")
     target_compile_options(spdlog_header_only INTERFACE "/Zc:__cplusplus")
     if (SPDLOG_MSVC_UTF8)
-        # fmtlib requires the /utf-8 flag when building with msvc. see https://github.com/fmtlib/fmt/pull/4159 on the
+        # fmtlib requires the /utf-8 flag when building with msvc.
-        # purpose of the additional
+        # see https://github.com/fmtlib/fmt/pull/4159 on the purpose of the additional
         # "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>"
         target_compile_options(spdlog PUBLIC $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
-        target_compile_options(spdlog_header_only
+        target_compile_options(spdlog_header_only INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
-                               INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
     endif ()
 endif ()
 
@@ -304,13 +304,12 @@ endif()
 # ---------------------------------------------------------------------------------------
 if (SPDLOG_NO_EXCEPTIONS)
     if (NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
-        target_compile_definitions(spdlog PUBLIC FMT_USE_EXCEPTIONS=0)
+        target_compile_definitions(spdlog PUBLIC FMT_EXCEPTIONS=0)
     endif ()
     if (NOT MSVC)
         target_compile_options(spdlog PRIVATE -fno-exceptions)
     else ()
         target_compile_options(spdlog PRIVATE /EHs-c-)
-        target_compile_definitions(spdlog PRIVATE _HAS_EXCEPTIONS=0)
     endif ()
 endif ()
 # ---------------------------------------------------------------------------------------

README.md

@@ -11,7 +11,7 @@ Fast C++ logging library
 
 ## Install
 #### Header-only version
-Copy the include [folder](include/spdlog) to your build tree and use a C++11 compiler.
+Copy the include [folder](https://github.com/gabime/spdlog/tree/v1.x/include/spdlog) to your build tree and use a C++11 compiler.
 
 #### Compiled version (recommended - much faster compile times)
 ```console
@@ -19,7 +19,7 @@ $ git clone https://github.com/gabime/spdlog.git
 $ cd spdlog && mkdir build && cd build
 $ cmake .. && cmake --build .
 ```
-see example [CMakeLists.txt](example/CMakeLists.txt) on how to use.
+see example [CMakeLists.txt](https://github.com/gabime/spdlog/blob/v1.x/example/CMakeLists.txt) on how to use.
 
 ## Platforms
 * Linux, FreeBSD, OpenBSD, Solaris, AIX
@@ -48,7 +48,7 @@ see example [CMakeLists.txt](example/CMakeLists.txt) on how to use.
 * Headers only or compiled
 * Feature-rich formatting, using the excellent [fmt](https://github.com/fmtlib/fmt) library.
 * Asynchronous mode (optional)
-* [Custom](https://github.com/gabime/spdlog/wiki/Custom-formatting) formatting.
+* [Custom](https://github.com/gabime/spdlog/wiki/3.-Custom-formatting) formatting.
 * Multi/Single threaded loggers.
 * Various log targets:
   * Rotating log files.
@@ -58,7 +58,7 @@ see example [CMakeLists.txt](example/CMakeLists.txt) on how to use.
   * Windows event log.
   * Windows debugger (```OutputDebugString(..)```).
   * Log to Qt widgets ([example](#log-to-qt-with-nice-colors)).
-  * Easily [extendable](https://github.com/gabime/spdlog/wiki/Sinks#implementing-your-own-sink) with custom log targets.
+  * Easily [extendable](https://github.com/gabime/spdlog/wiki/4.-Sinks#implementing-your-own-sink) with custom log targets.
 * Log filtering - log levels can be modified at runtime as well as compile time.
 * Support for loading log levels from argv or environment var.
 * [Backtrace](#backtrace-support) support - store debug messages in a ring buffer and display them later on demand.
@@ -467,7 +467,7 @@ void mdc_example()
 ---
 ## Benchmarks
 
-Below are some [benchmarks](bench/bench.cpp) done in Ubuntu 64 bit, Intel i7-4770 CPU @ 3.40GHz
+Below are some [benchmarks](https://github.com/gabime/spdlog/blob/v1.x/bench/bench.cpp) done in Ubuntu 64 bit, Intel i7-4770 CPU @ 3.40GHz
 
 #### Synchronous mode
 ```
@@ -519,8 +519,7 @@ Below are some [benchmarks](bench/bench.cpp) done in Ubuntu 64 bit, Intel i7-477
 ```
 
 ## Documentation
-
+Documentation can be found in the [wiki](https://github.com/gabime/spdlog/wiki/1.-QuickStart) pages.
-Documentation can be found in the [wiki](https://github.com/gabime/spdlog/wiki) pages.
 
 ---
 

example/example.cpp

@@ -382,14 +382,14 @@ void replace_default_logger_example() {
     spdlog::set_default_logger(old_logger);
 }
 
-// Mapped Diagnostic Context (MDC) is a map that stores key-value pairs (string values) in thread
+// Mapped Diagnostic Context (MDC) is a map that stores key-value pairs (string values) in thread local storage.
-// local storage. Each thread maintains its own MDC, which loggers use to append diagnostic
+// Each thread maintains its own MDC, which loggers use to append diagnostic information to log outputs.
-// information to log outputs. Note: it is not supported in asynchronous mode due to its reliance on
+// Note: it is not supported in asynchronous mode due to its reliance on thread-local storage.
-// thread-local storage.
 
 #ifndef SPDLOG_NO_TLS
     #include "spdlog/mdc.h"
-void mdc_example() {
+void mdc_example()
+{
     spdlog::mdc::put("key1", "value1");
     spdlog::mdc::put("key2", "value2");
     // if not using the default format, you can use the %& formatter to print mdc data as well

include/spdlog/async.h

@@ -89,7 +89,8 @@ inline void init_thread_pool(size_t q_size,
 }
 
 inline void init_thread_pool(size_t q_size, size_t thread_count) {
-    init_thread_pool(q_size, thread_count, [] {}, [] {});
+    init_thread_pool(
+        q_size, thread_count, [] {}, [] {});
 }
 
 // get the global thread pool.

include/spdlog/details/os-inl.h

@@ -483,12 +483,13 @@ SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target) {
     }
 
     // find the size to allocate for the result buffer
-    int result_size = ::MultiByteToWideChar(CP_UTF8, 0, str.data(), str_size, NULL, 0);
+    int result_size =
+        ::MultiByteToWideChar(CP_UTF8, 0, str.data(), str_size, NULL, 0);
 
     if (result_size > 0) {
         target.resize(result_size);
-        result_size =
+        result_size = ::MultiByteToWideChar(CP_UTF8, 0, str.data(), str_size, target.data(),
-            ::MultiByteToWideChar(CP_UTF8, 0, str.data(), str_size, target.data(), result_size);
+                                            result_size);
         if (result_size > 0) {
             assert(result_size == target.size());
             return;

include/spdlog/details/thread_pool-inl.h

@@ -38,7 +38,8 @@ SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items,
     : thread_pool(q_max_items, threads_n, on_thread_start, [] {}) {}
 
 SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n)
-    : thread_pool(q_max_items, threads_n, [] {}, [] {}) {}
+    : thread_pool(
+          q_max_items, threads_n, [] {}, [] {}) {}
 
 // message all threads to terminate gracefully join them
 SPDLOG_INLINE thread_pool::~thread_pool() {

include/spdlog/fmt/bin_to_hex.h

@@ -142,8 +142,8 @@ struct formatter<spdlog::details::dump_info<T>, char> {
 
     // format the given bytes range as hex
     template <typename FormatContext, typename Container>
-    auto format(const spdlog::details::dump_info<Container> &the_range,
+    auto format(const spdlog::details::dump_info<Container> &the_range, FormatContext &ctx) const
-                FormatContext &ctx) const -> decltype(ctx.out()) {
+        -> decltype(ctx.out()) {
         SPDLOG_CONSTEXPR const char *hex_upper = "0123456789ABCDEF";
         SPDLOG_CONSTEXPR const char *hex_lower = "0123456789abcdef";
         const char *hex_chars = use_uppercase ? hex_upper : hex_lower;

include/spdlog/mdc.h

@@ -12,14 +12,12 @@
 
 #include <spdlog/common.h>
 
-// MDC is a simple map of key->string values stored in thread local storage whose content will be
+// MDC is a simple map of key->string values stored in thread local storage whose content will be printed by the loggers.
-// printed by the loggers. Note: Not supported in async mode (thread local storage - so the async
+// Note: Not supported in async mode (thread local storage - so the async thread pool have different copy).
-// thread pool have different copy).
 //
 // Usage example:
 // spdlog::mdc::put("mdc_key_1", "mdc_value_1");
-// spdlog::info("Hello, {}", "World!");  // => [2024-04-26 02:08:05.040] [info]
+// spdlog::info("Hello, {}", "World!");  // => [2024-04-26 02:08:05.040] [info] [mdc_key_1:mdc_value_1] Hello, World!
-// [mdc_key_1:mdc_value_1] Hello, World!
 
 namespace spdlog {
 class SPDLOG_API mdc {

include/spdlog/sinks/ansicolor_sink-inl.h

@@ -111,8 +111,7 @@ SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color_mode_(color_mode mode
 }
 
 template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_ccode_(
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_ccode_(const string_view_t &color_code) const {
-    const string_view_t &color_code) const {
     details::os::fwrite_bytes(color_code.data(), color_code.size(), target_file_);
 }
 

include/spdlog/sinks/dup_filter_sink.h

@@ -40,21 +40,22 @@ template <typename Mutex>
 class dup_filter_sink : public dist_sink<Mutex> {
 public:
     template <class Rep, class Period>
-    explicit dup_filter_sink(std::chrono::duration<Rep, Period> max_skip_duration)
+    explicit dup_filter_sink(std::chrono::duration<Rep, Period> max_skip_duration,
-        : max_skip_duration_{max_skip_duration} {}
+                             level::level_enum notification_level = level::info)
+        : max_skip_duration_{max_skip_duration},
+          log_level_{notification_level} {}
 
 protected:
     std::chrono::microseconds max_skip_duration_;
     log_clock::time_point last_msg_time_;
     std::string last_msg_payload_;
     size_t skip_counter_ = 0;
-    level::level_enum skipped_msg_log_level_ = spdlog::level::level_enum::off;
+    level::level_enum log_level_;
 
     void sink_it_(const details::log_msg &msg) override {
         bool filtered = filter_(msg);
         if (!filtered) {
             skip_counter_ += 1;
-            skipped_msg_log_level_ = msg.level;
             return;
         }
 
@@ -64,7 +65,7 @@ protected:
             auto msg_size = ::snprintf(buf, sizeof(buf), "Skipped %u duplicate messages..",
                                        static_cast<unsigned>(skip_counter_));
             if (msg_size > 0 && static_cast<size_t>(msg_size) < sizeof(buf)) {
-                details::log_msg skipped_msg{msg.source, msg.logger_name, skipped_msg_log_level_,
+                details::log_msg skipped_msg{msg.source, msg.logger_name, log_level_,
                                              string_view_t{buf, static_cast<size_t>(msg_size)}};
                 dist_sink<Mutex>::sink_it_(skipped_msg);
             }

include/spdlog/sinks/rotating_file_sink-inl.h

@@ -14,6 +14,7 @@
 #include <spdlog/fmt/fmt.h>
 
 #include <cerrno>
+#include <chrono>
 #include <ctime>
 #include <mutex>
 #include <string>
@@ -37,8 +38,8 @@ SPDLOG_INLINE rotating_file_sink<Mutex>::rotating_file_sink(
         throw_spdlog_ex("rotating sink constructor: max_size arg cannot be zero");
     }
 
-    if (max_files > MaxFiles) {
+    if (max_files > 200000) {
-        throw_spdlog_ex("rotating sink constructor: max_files arg cannot exceed MaxFiles");
+        throw_spdlog_ex("rotating sink constructor: max_files arg cannot exceed 200000");
     }
     file_helper_.open(calc_filename(base_filename_, 0));
     current_size_ = file_helper_.size();  // expensive. called only once
@@ -53,12 +54,11 @@ SPDLOG_INLINE rotating_file_sink<Mutex>::rotating_file_sink(
 template <typename Mutex>
 SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename_t &filename,
                                                                   std::size_t index) {
-    if (index == 0U) {
+    if (index == 0u) {
         return filename;
     }
 
-    filename_t basename;
+    filename_t basename, ext;
-    filename_t ext;
     std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
     return fmt_lib::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{}.{}{}")), basename, index, ext);
 }
@@ -74,35 +74,6 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::rotate_now() {
     std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
     rotate_();
 }
-template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::set_max_size(std::size_t max_size) {
-    std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-    if (max_size == 0) {
-        throw_spdlog_ex("rotating sink set_max_size: max_size arg cannot be zero");
-    }
-    max_size_ = max_size;
-}
-
-template <typename Mutex>
-SPDLOG_INLINE std::size_t rotating_file_sink<Mutex>::get_max_size() {
-    std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-    return max_size_;
-}
-
-template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::set_max_files(std::size_t max_files) {
-    std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-    if (max_files > MaxFiles) {
-        throw_spdlog_ex("rotating sink set_max_files: max_files arg cannot exceed 200000");
-    }
-    max_files_ = max_files;
-}
-
-template <typename Mutex>
-std::size_t rotating_file_sink<Mutex>::get_max_files() {
-    std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-    return max_files_;
-}
 
 template <typename Mutex>
 SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &msg) {

include/spdlog/sinks/rotating_file_sink.h

@@ -8,6 +8,7 @@
 #include <spdlog/details/synchronous_factory.h>
 #include <spdlog/sinks/base_sink.h>
 
+#include <chrono>
 #include <mutex>
 #include <string>
 
@@ -20,7 +21,6 @@ namespace sinks {
 template <typename Mutex>
 class rotating_file_sink final : public base_sink<Mutex> {
 public:
-    static constexpr size_t MaxFiles = 200000;
     rotating_file_sink(filename_t base_filename,
                        std::size_t max_size,
                        std::size_t max_files,
@@ -29,10 +29,6 @@ public:
     static filename_t calc_filename(const filename_t &filename, std::size_t index);
     filename_t filename();
     void rotate_now();
-    void set_max_size(std::size_t max_size);
-    std::size_t get_max_size();
-    void set_max_files(std::size_t max_files);
-    std::size_t get_max_files();
 
 protected:
     void sink_it_(const details::log_msg &msg) override;
@@ -65,8 +61,9 @@ using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;
 //
 // factory functions
 //
+
 template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> rotating_logger_mt(const std::string &logger_name,
+inline std::shared_ptr<logger> rotating_logger_mt(const std::string &logger_name,
                                                   const filename_t &filename,
                                                   size_t max_file_size,
                                                   size_t max_files,
@@ -77,7 +74,7 @@ std::shared_ptr<logger> rotating_logger_mt(const std::string &logger_name,
 }
 
 template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> rotating_logger_st(const std::string &logger_name,
+inline std::shared_ptr<logger> rotating_logger_st(const std::string &logger_name,
                                                   const filename_t &filename,
                                                   size_t max_file_size,
                                                   size_t max_files,

include/spdlog/tweakme.h

@@ -109,8 +109,8 @@
 //
 // #include <string_view>
 // using namespace std::string_view_literals;
-// #define SPDLOG_LEVEL_NAMES { "MY TRACE"sv, "MY DEBUG"sv, "MY INFO"sv, "MY WARNING"sv, "MY
+// #define SPDLOG_LEVEL_NAMES { "MY TRACE"sv, "MY DEBUG"sv, "MY INFO"sv, "MY WARNING"sv, "MY ERROR"sv, "MY
-// ERROR"sv, "MY CRITICAL"sv, "OFF"sv }
+// CRITICAL"sv, "OFF"sv }
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////

include/spdlog/version.h

@@ -5,7 +5,7 @@
 
 #define SPDLOG_VER_MAJOR 1
 #define SPDLOG_VER_MINOR 15
-#define SPDLOG_VER_PATCH 2
+#define SPDLOG_VER_PATCH 1
 
 #define SPDLOG_TO_VERSION(major, minor, patch) (major * 10000 + minor * 100 + patch)
 #define SPDLOG_VERSION SPDLOG_TO_VERSION(SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH)

src/bundled_fmtlib_format.cpp

@@ -13,8 +13,10 @@
 FMT_BEGIN_NAMESPACE
 namespace detail {
 
-template FMT_API auto dragonbox::to_decimal(float x) noexcept -> dragonbox::decimal_fp<float>;
+template FMT_API auto dragonbox::to_decimal(float x) noexcept
-template FMT_API auto dragonbox::to_decimal(double x) noexcept -> dragonbox::decimal_fp<double>;
+    -> dragonbox::decimal_fp<float>;
+template FMT_API auto dragonbox::to_decimal(double x) noexcept
+    -> dragonbox::decimal_fp<double>;
 
 #if FMT_USE_LOCALE
 // DEPRECATED! locale_ref in the detail namespace
@@ -24,21 +26,21 @@ template FMT_API auto locale_ref::get<std::locale>() const -> std::locale;
 
 // Explicit instantiations for char.
 
-template FMT_API auto thousands_sep_impl(locale_ref) -> thousands_sep_result<char>;
+template FMT_API auto thousands_sep_impl(locale_ref)
+    -> thousands_sep_result<char>;
 template FMT_API auto decimal_point_impl(locale_ref) -> char;
 
 // DEPRECATED!
 template FMT_API void buffer<char>::append(const char*, const char*);
 
 // DEPRECATED!
-template FMT_API void vformat_to(buffer<char>&,
+template FMT_API void vformat_to(buffer<char>&, string_view,
-                                 string_view,
+                                 typename vformat_args<>::type, locale_ref);
-                                 typename vformat_args<>::type,
-                                 locale_ref);
 
 // Explicit instantiations for wchar_t.
 
-template FMT_API auto thousands_sep_impl(locale_ref) -> thousands_sep_result<wchar_t>;
+template FMT_API auto thousands_sep_impl(locale_ref)
+    -> thousands_sep_result<wchar_t>;
 template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t;
 
 template FMT_API void buffer<wchar_t>::append(const wchar_t*, const wchar_t*);
@@ -46,4 +48,5 @@ template FMT_API void buffer<wchar_t>::append(const wchar_t*, const wchar_t*);
 }  // namespace detail
 FMT_END_NAMESPACE
 
+
 #endif  // !SPDLOG_FMT_EXTERNAL

tests/CMakeLists.txt

@@ -19,8 +19,8 @@ if(Catch2_FOUND)
 else()
     message(STATUS "Bundled version of Catch will be downloaded and used.")
     include(FetchContent)
-    FetchContent_Declare(
+    FetchContent_Declare(Catch2
-        Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+            GIT_REPOSITORY https://github.com/catchorg/Catch2.git
             GIT_TAG 53d0d913a422d356b23dd927547febdf69ee9081 # v3.5.0
     )
     FetchContent_MakeAvailable(Catch2)

tests/test_custom_callbacks.cpp

@@ -16,8 +16,7 @@ TEST_CASE("custom_callback_logger", "[custom_callback_logger]") {
             spdlog::memory_buf_t formatted;
             formatter.format(msg, formatted);
             auto eol_len = strlen(spdlog::details::os::default_eol);
-            using diff_t =
+            using diff_t = typename std::iterator_traits<decltype(formatted.end())>::difference_type; 
-                typename std::iterator_traits<decltype(formatted.end())>::difference_type;
             lines.emplace_back(formatted.begin(), formatted.end() - static_cast<diff_t>(eol_len));
         });
     std::shared_ptr<spdlog::sinks::test_sink_st> test_sink(new spdlog::sinks::test_sink_st);

tests/test_daily_logger.cpp

@@ -46,8 +46,10 @@ TEST_CASE("daily_logger with dateonly calculator", "[daily_logger]") {
 
 struct custom_daily_file_name_calculator {
     static spdlog::filename_t calc_filename(const spdlog::filename_t &basename, const tm &now_tm) {
-        return spdlog::fmt_lib::format(SPDLOG_FILENAME_T("{}{:04d}{:02d}{:02d}"), basename,
+        
-                                       now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday);
+        return spdlog::fmt_lib::format(SPDLOG_FILENAME_T("{}{:04d}{:02d}{:02d}"),
+                                   basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1,
+                                   now_tm.tm_mday);        
     }
 };
 

tests/test_file_logging.cpp

@@ -94,11 +94,14 @@ TEST_CASE("rotating_file_logger2", "[rotating_logger]") {
         // next logger can rename the first output file.
         spdlog::drop(logger->name());
     }
+
     auto logger = spdlog::rotating_logger_mt("logger", basename, max_size, 2, true);
     for (int i = 0; i < 10; ++i) {
         logger->info("Test message {}", i);
     }
+
     logger->flush();
+
     require_message_count(ROTATING_LOG, 10);
 
     for (int i = 0; i < 1000; i++) {
@@ -138,50 +141,3 @@ TEST_CASE("rotating_file_logger4", "[rotating_logger]") {
     REQUIRE(get_filesize(ROTATING_LOG) > 0);
     REQUIRE(get_filesize(ROTATING_LOG ".1") > 0);
 }
-
-// test changing the max size of the rotating file sink
-TEST_CASE("rotating_file_logger5", "[rotating_logger]") {
-    prepare_logdir();
-    size_t max_size = 5 * 1024;
-    size_t max_files = 2;
-    spdlog::filename_t basename = SPDLOG_FILENAME_T(ROTATING_LOG);
-    auto sink =
-        std::make_shared<spdlog::sinks::rotating_file_sink_st>(basename, max_size, max_files);
-    auto logger = std::make_shared<spdlog::logger>("rotating_sink_logger", sink);
-    logger->set_pattern("%v");
-
-    REQUIRE(sink->get_max_size() == max_size);
-    REQUIRE(sink->get_max_files() == max_files);
-    max_size = 7 * 1024;
-    max_files = 3;
-
-    sink->set_max_size(max_size);
-    sink->set_max_files(max_files);
-    REQUIRE(sink->get_max_size() == max_size);
-    REQUIRE(sink->get_max_files() == max_files);
-
-    const auto message = std::string(200, 'x');
-    assert(message.size() < max_size);
-    const auto n_messages = max_files * max_size / message.size();
-    for (size_t i = 0; i < n_messages; ++i) {
-        logger->info(message);
-    }
-    logger.reset();  // force flush and close the file
-
-    // validate that the files were rotated correctly with the new max size and max files
-    for (size_t i = 0; i <= max_files; i++) {
-        // calc filenames
-        // e.g. rotating_log, rotating_log.0 rotating_log.1, rotating_log.2, etc.
-        std::ostringstream oss;
-        oss << ROTATING_LOG;
-        if (i > 0) {
-            oss << '.' << i;
-        }
-        const auto filename = oss.str();
-        const auto filesize = get_filesize(filename);
-        REQUIRE(filesize <= max_size);
-        if (i > 0) {
-            REQUIRE(filesize >= max_size - message.size() - 2);
-        }
-    }
-}

tests/test_misc.cpp

@@ -185,16 +185,14 @@ TEST_CASE("utf8 to utf16 conversion using windows api", "[windows utf]") {
     spdlog::details::os::utf8_to_wstrbuf("\xc3\x28", buffer); // Invalid UTF-8 sequence.
     REQUIRE(std::wstring(buffer.data(), buffer.size()) == std::wstring(L"\xfffd("));
 
-    spdlog::details::os::utf8_to_wstrbuf("\xe3\x81\xad\xe3\x81\x93",
+    spdlog::details::os::utf8_to_wstrbuf("\xe3\x81\xad\xe3\x81\x93", buffer); // "Neko" in hiragana.
-                                         buffer);  // "Neko" in hiragana.
     REQUIRE(std::wstring(buffer.data(), buffer.size()) == std::wstring(L"\x306d\x3053"));
 }
 #endif
 
 struct auto_closer {
     FILE* fp = nullptr;
-    explicit auto_closer(FILE* f)
+    explicit auto_closer(FILE* f) : fp(f) {}
-        : fp(f) {}
     auto_closer(const auto_closer&) = delete;
     auto_closer& operator=(const auto_closer&) = delete;
     ~auto_closer() {
@@ -203,8 +201,8 @@ struct auto_closer {
 };
 
 TEST_CASE("os::fwrite_bytes", "[os]") {
-    using spdlog::details::os::create_dir;
     using spdlog::details::os::fwrite_bytes;
+    using spdlog::details::os::create_dir;
     const char* filename = "log_tests/test_fwrite_bytes.txt";
     const char *msg = "hello";
     prepare_logdir();

tests/test_pattern_formatter.cpp

@@ -23,9 +23,7 @@ static std::string log_to_str(const std::string &msg, const Args &...args) {
 
 // log to str and return it with time
 template <typename... Args>
-static std::string log_to_str_with_time(spdlog::log_clock::time_point log_time,
+static std::string log_to_str_with_time(spdlog::log_clock::time_point log_time, const std::string &msg, const Args &...args) {
-                                        const std::string &msg,
-                                        const Args &...args) {
     std::ostringstream oss;
     auto oss_sink = std::make_shared<spdlog::sinks::ostream_sink_mt>(oss);
     spdlog::logger oss_logger("pattern_tester", oss_sink);
@@ -82,8 +80,8 @@ TEST_CASE("GMT offset ", "[pattern_formatter]") {
     const auto now = std::chrono::system_clock::now();
     const auto yesterday = now - 24h;
 
-    REQUIRE(log_to_str_with_time(yesterday, "Some message", "%z", spdlog::pattern_time_type::utc,
+    REQUIRE(log_to_str_with_time(yesterday, "Some message", "%z", spdlog::pattern_time_type::utc, "\n") ==
-                                 "\n") == "+00:00\n");
+            "+00:00\n");
 }
 
 TEST_CASE("color range test1", "[pattern_formatter]") {

tests/utils.cpp

@@ -50,8 +50,9 @@ void require_message_count(const std::string &filename, const std::size_t messag
 std::size_t get_filesize(const std::string &filename) {
     std::ifstream ifs(filename, std::ifstream::ate | std::ifstream::binary);
     if (!ifs) {
-        throw std::runtime_error("Failed open file " + filename);
+        throw std::runtime_error("Failed open file ");
     }
+
     return static_cast<std::size_t>(ifs.tellg());
 }