Update jetbrains logo

.github/workflows/coverity_scan.yml

@@ -1,6 +1,6 @@
 name: coverity-linux
 
-on: [push, pull_request]
+on: [pull_request]
 
 permissions:
   contents: read
@@ -35,7 +35,6 @@ jobs:
         run: |
           tar czf cov-int.tgz cov-int
           response=$(curl --silent --show-error --fail \
-            --form email="${{ secrets.EMAIL }}" \
             --form token="${{ secrets.COVERITY_TOKEN }}" \
             --form file=@cov-int.tgz \
             --form version="GitHub PR #${{ github.event.pull_request.number }}" \

include/spdlog/cfg/helpers-inl.h

@@ -71,7 +71,7 @@ inline std::unordered_map<std::string, std::string> extract_key_vals_(const std:
 }
 
 SPDLOG_INLINE void load_levels(const std::string &input) {
-    if (input.empty() || input.size() >= 32768) {
+    if (input.empty() || input.size() > 512) {
         return;
     }
 

include/spdlog/details/os-inl.h

@@ -563,21 +563,21 @@ SPDLOG_INLINE filename_t dir_name(const filename_t &path) {
     return pos != filename_t::npos ? path.substr(0, pos) : filename_t{};
 }
 
-#ifdef _MSC_VER
-    #pragma warning(push)
-    #pragma warning(disable : 4996)
-#endif  // _MSC_VER
 std::string SPDLOG_INLINE getenv(const char *field) {
-#if defined(_MSC_VER) && defined(__cplusplus_winrt)
+#if defined(_MSC_VER)
+    #if defined(__cplusplus_winrt)
     return std::string{};  // not supported under uwp
-#else
-    char *buf = std::getenv(field);
+    #else
+    size_t len = 0;
+    char buf[128];
+    bool ok = ::getenv_s(&len, buf, sizeof(buf), field) == 0;
+    return ok ? buf : std::string{};
+    #endif
+#else  // revert to getenv
+    char *buf = ::getenv(field);
     return buf ? buf : std::string{};
 #endif
 }
-#ifdef _MSC_VER
-    #pragma warning(pop)
-#endif  // _MSC_VER
 
 // Do fsync by FILE handlerpointer
 // Return true on success

include/spdlog/fmt/fmt.h

@@ -20,7 +20,11 @@
     #ifndef FMT_USE_WINDOWS_H
         #define FMT_USE_WINDOWS_H 0
     #endif
+
+    #include <spdlog/fmt/bundled/base.h>
     #include <spdlog/fmt/bundled/format.h>
+
 #else  // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
+    #include <fmt/base.h>
     #include <fmt/format.h>
 #endif

include/spdlog/sinks/ansicolor_sink.h

@@ -40,7 +40,7 @@ public:
 
     void log(const details::log_msg &msg) override;
     void flush() override;
-    void set_pattern(const std::string &pattern) override;
+    void set_pattern(const std::string &pattern) final override;
     void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override;
 
     // Formatting codes

include/spdlog/sinks/ringbuffer_sink.h

@@ -21,11 +21,7 @@ template <typename Mutex>
 class ringbuffer_sink final : public base_sink<Mutex> {
 public:
     explicit ringbuffer_sink(size_t n_items)
-        : q_{n_items} {
-        if (n_items == 0) {
-            throw_spdlog_ex("ringbuffer_sink: n_items cannot be zero");
-        }
-    }
+        : q_{n_items} {}
 
     std::vector<details::log_msg_buffer> last_raw(size_t lim = 0) {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);

include/spdlog/sinks/wincolor_sink.h

@@ -31,10 +31,10 @@ public:
 
     // change the color for the given level
     void set_color(level::level_enum level, std::uint16_t color);
-    void log(const details::log_msg &msg) override;
-    void flush() override;
-    void set_pattern(const std::string &pattern) override;
-    void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override;
+    void log(const details::log_msg &msg) final override;
+    void flush() final override;
+    void set_pattern(const std::string &pattern) override final;
+    void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override final;
     void set_color_mode(color_mode mode);
 
 protected:

tests/CMakeLists.txt

@@ -49,8 +49,7 @@ set(SPDLOG_UTESTS_SOURCES
     test_time_point.cpp
     test_stopwatch.cpp
     test_circular_q.cpp
-    test_bin_to_hex.cpp
-    test_ringbuffer.cpp)
+    test_bin_to_hex.cpp)
 
 if(NOT SPDLOG_NO_EXCEPTIONS)
     list(APPEND SPDLOG_UTESTS_SOURCES test_errors.cpp)

tests/test_ringbuffer.cpp

@@ -1,53 +0,0 @@
-#include "includes.h"
-#include "spdlog/sinks/ringbuffer_sink.h"
-
-TEST_CASE("ringbuffer invalid size", "[ringbuffer]") {
-    REQUIRE_THROWS_AS(spdlog::sinks::ringbuffer_sink_mt(0), spdlog::spdlog_ex);
-}
-
-TEST_CASE("ringbuffer stores formatted messages", "[ringbuffer]") {
-    spdlog::sinks::ringbuffer_sink_st sink(3);
-    sink.set_pattern("%v");
-
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "msg1"});
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "msg2"});
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "msg3"});
-
-    auto formatted = sink.last_formatted();
-    REQUIRE(formatted.size() == 3);
-    using spdlog::details::os::default_eol;
-    REQUIRE(formatted[0] == spdlog::fmt_lib::format("msg1{}", default_eol));
-    REQUIRE(formatted[1] == spdlog::fmt_lib::format("msg2{}", default_eol));
-    REQUIRE(formatted[2] == spdlog::fmt_lib::format("msg3{}", default_eol));
-}
-
-TEST_CASE("ringbuffer overrun keeps last items", "[ringbuffer]") {
-    spdlog::sinks::ringbuffer_sink_st sink(2);
-    sink.set_pattern("%v");
-
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "first"});
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "second"});
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "third"});
-
-    auto formatted = sink.last_formatted();
-    REQUIRE(formatted.size() == 2);
-    using spdlog::details::os::default_eol;
-    REQUIRE(formatted[0] == spdlog::fmt_lib::format("second{}", default_eol));
-    REQUIRE(formatted[1] == spdlog::fmt_lib::format("third{}", default_eol));
-}
-
-TEST_CASE("ringbuffer retrieval limit", "[ringbuffer]") {
-    spdlog::sinks::ringbuffer_sink_st sink(3);
-    sink.set_pattern("%v");
-
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "A"});
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "B"});
-    sink.log(spdlog::details::log_msg{"test", spdlog::level::info, "C"});
-
-    auto formatted = sink.last_formatted(2);
-    REQUIRE(formatted.size() == 2);
-    using spdlog::details::os::default_eol;
-    REQUIRE(formatted[0] == spdlog::fmt_lib::format("B{}", default_eol));
-    REQUIRE(formatted[1] == spdlog::fmt_lib::format("C{}", default_eol));
-}
-