diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 26d3708e..aca483c2 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -81,7 +81,7 @@ #if FMT_USE_CONSTEXPR #define SPDLOG_CONSTEXPR_FUNC FMT_CONSTEXPR #else - #define SPDLOG_CONSTEXPR_FUNC inline + #define SPDLOG_CONSTEXPR_FUNC inline #endif #endif diff --git a/include/spdlog/details/file_helper-inl.h b/include/spdlog/details/file_helper-inl.h index 69af9b6a..37d1d46f 100644 --- a/include/spdlog/details/file_helper-inl.h +++ b/include/spdlog/details/file_helper-inl.h @@ -98,7 +98,7 @@ SPDLOG_INLINE void file_helper::close() { } SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf) { - if(fd_ == nullptr) return; + if (fd_ == nullptr) return; size_t msg_size = buf.size(); auto data = buf.data(); if (std::fwrite(data, 1, msg_size, fd_) != msg_size) { diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h index 26cee740..e3c80b92 100644 --- a/include/spdlog/details/os-inl.h +++ b/include/spdlog/details/os-inl.h @@ -535,7 +535,7 @@ SPDLOG_INLINE bool create_dir(const filename_t &path) { auto subdir = path.substr(0, token_pos); #ifdef _WIN32 - // if subdir is just a drive letter, add a slash e.g. "c:"=>"c:\", + // if subdir is just a drive letter, add a slash e.g. "c:"=>"c:\", // otherwise path_exists(subdir) returns false (issue #3079) const bool is_drive = subdir.length() == 2 && subdir[1] == ':'; if (is_drive) { diff --git a/include/spdlog/details/registry-inl.h b/include/spdlog/details/registry-inl.h index 4e99ba9d..f447848e 100644 --- a/include/spdlog/details/registry-inl.h +++ b/include/spdlog/details/registry-inl.h @@ -84,7 +84,6 @@ SPDLOG_INLINE std::shared_ptr registry::get(const std::string &logger_na return found == loggers_.end() ? nullptr : found->second; } - SPDLOG_INLINE std::shared_ptr registry::default_logger() { std::lock_guard lock(logger_map_mutex_); return default_logger_; @@ -99,7 +98,7 @@ SPDLOG_INLINE logger *registry::get_default_raw() { return default_logger_.get() // set default logger. // default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map. SPDLOG_INLINE void registry::set_default_logger(std::shared_ptr new_default_logger) { - std::lock_guard lock(logger_map_mutex_); + std::lock_guard lock(logger_map_mutex_); if (new_default_logger != nullptr) { loggers_[new_default_logger->name()] = new_default_logger; } diff --git a/include/spdlog/details/registry.h b/include/spdlog/details/registry.h index 412e3eaf..8afcbd6f 100644 --- a/include/spdlog/details/registry.h +++ b/include/spdlog/details/registry.h @@ -44,7 +44,8 @@ public: // set default logger and add it to the registry if not registered already. // default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map. - // Note: Make sure to unregister it when no longer needed or before calling again with a new logger. + // Note: Make sure to unregister it when no longer needed or before calling again with a new + // logger. void set_default_logger(std::shared_ptr new_default_logger); void set_tp(std::shared_ptr tp); @@ -70,8 +71,8 @@ public: } std::unique_ptr &get_flusher() { - std::lock_guard lock(flusher_mutex_); - return periodic_flusher_; + std::lock_guard lock(flusher_mutex_); + return periodic_flusher_; } void set_error_handler(err_handler handler); diff --git a/include/spdlog/details/thread_pool.h b/include/spdlog/details/thread_pool.h index 286352e3..0d56a091 100644 --- a/include/spdlog/details/thread_pool.h +++ b/include/spdlog/details/thread_pool.h @@ -67,9 +67,7 @@ struct async_msg : log_msg_buffer { worker_ptr{std::move(worker)}, flush_promise{} {} - async_msg(async_logger_ptr &&worker, - async_msg_type the_type, - std::promise &&promise) + async_msg(async_logger_ptr &&worker, async_msg_type the_type, std::promise &&promise) : log_msg_buffer{}, msg_type{the_type}, worker_ptr{std::move(worker)}, diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index e9c51175..7fa6b093 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -20,7 +20,7 @@ #ifndef FMT_USE_WINDOWS_H #define FMT_USE_WINDOWS_H 0 #endif - + #include #include diff --git a/include/spdlog/mdc.h b/include/spdlog/mdc.h index 9b1a80ee..1713c820 100644 --- a/include/spdlog/mdc.h +++ b/include/spdlog/mdc.h @@ -6,31 +6,31 @@ #include namespace spdlog { - class SPDLOG_API mdc { - public: - using mdc_map_t = std::map; +class SPDLOG_API mdc { +public: + using mdc_map_t = std::map; - static void put(const std::string &key, const std::string &value) { - get_context()[key] = value; + static void put(const std::string &key, const std::string &value) { + get_context()[key] = value; + } + + static std::string get(const std::string &key) { + auto &context = get_context(); + auto it = context.find(key); + if (it != context.end()) { + return it->second; } + return ""; + } - static std::string get(const std::string &key) { - auto &context = get_context(); - auto it = context.find(key); - if (it != context.end()) { - return it->second; - } - return ""; - } + static void remove(const std::string &key) { get_context().erase(key); } - static void remove(const std::string &key) { get_context().erase(key); } + static void clear() { get_context().clear(); } - static void clear() { get_context().clear(); } - - static mdc_map_t &get_context() { - static thread_local mdc_map_t context; - return context; - } - }; + static mdc_map_t &get_context() { + static thread_local mdc_map_t context; + return context; + } +}; } // namespace spdlog diff --git a/include/spdlog/pattern_formatter-inl.h b/include/spdlog/pattern_formatter-inl.h index 65e22d45..756e5941 100644 --- a/include/spdlog/pattern_formatter-inl.h +++ b/include/spdlog/pattern_formatter-inl.h @@ -790,7 +790,7 @@ template class mdc_formatter : public flag_formatter { public: explicit mdc_formatter(padding_info padinfo) - : flag_formatter(padinfo) {} + : flag_formatter(padinfo) {} void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override { auto &mdc_map = mdc::get_context(); @@ -802,7 +802,7 @@ public: } } - void format_mdc(const mdc::mdc_map_t &mdc_map, memory_buf_t &dest){ + void format_mdc(const mdc::mdc_map_t &mdc_map, memory_buf_t &dest) { auto last_element = --mdc_map.end(); for (auto it = mdc_map.begin(); it != mdc_map.end(); ++it) { auto &pair = *it; @@ -825,8 +825,6 @@ public: } }; - - // Full info formatter // pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v class full_formatter final : public flag_formatter { @@ -921,8 +919,6 @@ private: mdc_formatter mdc_formatter_{padding_info{}}; }; - - } // namespace details SPDLOG_INLINE pattern_formatter::pattern_formatter(std::string pattern, diff --git a/include/spdlog/spdlog-inl.h b/include/spdlog/spdlog-inl.h index 3e5d7458..97c36222 100644 --- a/include/spdlog/spdlog-inl.h +++ b/include/spdlog/spdlog-inl.h @@ -20,7 +20,6 @@ SPDLOG_INLINE std::shared_ptr get(const std::string &name) { return details::registry::instance().get(name); } - SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) { details::registry::instance().set_formatter(std::move(formatter)); } diff --git a/tests/test_async.cpp b/tests/test_async.cpp index 94be61fc..3fa3b440 100644 --- a/tests/test_async.cpp +++ b/tests/test_async.cpp @@ -132,8 +132,8 @@ TEST_CASE("multithread flush", "[async]") { } REQUIRE(test_sink->flush_counter() >= 1); REQUIRE(test_sink->flush_counter() + errmsgs.size() == n_threads * flush_count); - if (errmsgs.size() > 0) { - REQUIRE(errmsgs[0] == "Broken promise"); + if (errmsgs.size() > 0) { + REQUIRE(errmsgs[0] == "Broken promise"); } } diff --git a/tests/test_create_dir.cpp b/tests/test_create_dir.cpp index f635c75a..fd040339 100644 --- a/tests/test_create_dir.cpp +++ b/tests/test_create_dir.cpp @@ -84,23 +84,23 @@ TEST_CASE("dir_name", "[create_dir]") { #ifdef _WIN32 -// -// test windows cases when drive letter is given e.g. C:\\some-folder -// -#include -#include + // + // test windows cases when drive letter is given e.g. C:\\some-folder + // + #include + #include std::string get_full_path(const std::string &relative_folder_path) { char full_path[MAX_PATH]; DWORD result = ::GetFullPathNameA(relative_folder_path.c_str(), MAX_PATH, full_path, nullptr); // Return an empty string if failed to get full path - return result > 0 && result < MAX_PATH ? std::string(full_path) : std::string(); + return result > 0 && result < MAX_PATH ? std::string(full_path) : std::string(); } std::wstring get_full_path(const std::wstring &relative_folder_path) { wchar_t full_path[MAX_PATH]; - DWORD result = ::GetFullPathNameW(relative_folder_path.c_str(), MAX_PATH, full_path, nullptr); + DWORD result = ::GetFullPathNameW(relative_folder_path.c_str(), MAX_PATH, full_path, nullptr); return result > 0 && result < MAX_PATH ? std::wstring(full_path) : std::wstring(); } @@ -109,16 +109,16 @@ spdlog::filename_t::value_type find_non_existing_drive() { std::string root_path = std::string(1, drive) + ":\\"; UINT drive_type = GetDriveTypeA(root_path.c_str()); if (drive_type == DRIVE_NO_ROOT_DIR) { - return static_cast (drive); + return static_cast(drive); } } return '\0'; // No available drive found } TEST_CASE("create_abs_path1", "[create_dir]") { - prepare_logdir(); + prepare_logdir(); auto abs_path = get_full_path(SPDLOG_FILENAME_T("test_logs\\logdir1")); - REQUIRE(!abs_path.empty()); + REQUIRE(!abs_path.empty()); REQUIRE(create_dir(abs_path) == true); } @@ -126,20 +126,19 @@ TEST_CASE("create_abs_path2", "[create_dir]") { prepare_logdir(); auto abs_path = get_full_path(SPDLOG_FILENAME_T("test_logs/logdir2")); REQUIRE(!abs_path.empty()); - REQUIRE(create_dir(abs_path) == true); + REQUIRE(create_dir(abs_path) == true); } -TEST_CASE("non_existing_drive", "[create_dir]") { - prepare_logdir(); +TEST_CASE("non_existing_drive", "[create_dir]") { + prepare_logdir(); spdlog::filename_t path; - + auto non_existing_drive = find_non_existing_drive(); - path += non_existing_drive ; - path += SPDLOG_FILENAME_T(":\\"); - REQUIRE(create_dir(path) == false); + path += non_existing_drive; + path += SPDLOG_FILENAME_T(":\\"); + REQUIRE(create_dir(path) == false); path += SPDLOG_FILENAME_T("subdir"); REQUIRE(create_dir(path) == false); - } -//#endif // SPDLOG_WCHAR_FILENAMES +// #endif // SPDLOG_WCHAR_FILENAMES #endif // _WIN32