From af50d5ef1f4eeb87ef25d3070efbbbc1ce61526c Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Sun, 25 Feb 2018 02:19:26 +0100 Subject: [PATCH] readability-inconsistent-declaration-parameter-name --- include/spdlog/async_logger.h | 4 ++-- include/spdlog/details/async_logger_impl.h | 14 +++++++------- include/spdlog/details/logger_impl.h | 12 ++++++------ include/spdlog/sinks/file_sinks.h | 4 +--- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/include/spdlog/async_logger.h b/include/spdlog/async_logger.h index 4b1190cc..c6a69f48 100644 --- a/include/spdlog/async_logger.h +++ b/include/spdlog/async_logger.h @@ -44,7 +44,7 @@ public: const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(), const std::function& worker_teardown_cb = nullptr); - async_logger(const std::string& logger_name, + async_logger(const std::string& name, sinks_init_list sinks, size_t queue_size, const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, @@ -52,7 +52,7 @@ public: const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(), const std::function& worker_teardown_cb = nullptr); - async_logger(const std::string& logger_name, + async_logger(const std::string& name, sink_ptr single_sink, size_t queue_size, const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, diff --git a/include/spdlog/details/async_logger_impl.h b/include/spdlog/details/async_logger_impl.h index d9a1e424..dabc729b 100644 --- a/include/spdlog/details/async_logger_impl.h +++ b/include/spdlog/details/async_logger_impl.h @@ -17,7 +17,7 @@ #include template -inline spdlog::async_logger::async_logger(const std::string& logger_name, +inline spdlog::async_logger::async_logger(const std::string& name, const It& begin, const It& end, size_t queue_size, @@ -25,28 +25,28 @@ inline spdlog::async_logger::async_logger(const std::string& logger_name, const std::function& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function& worker_teardown_cb) : - logger(logger_name, begin, end), + logger(name, begin, end), _async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, _err_handler, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb)) { } -inline spdlog::async_logger::async_logger(const std::string& logger_name, - sinks_init_list sinks_list, +inline spdlog::async_logger::async_logger(const std::string& name, + sinks_init_list sinks, size_t queue_size, const async_overflow_policy overflow_policy, const std::function& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function& worker_teardown_cb) : - async_logger(logger_name, sinks_list.begin(), sinks_list.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} + async_logger(name, sinks.begin(), sinks.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} -inline spdlog::async_logger::async_logger(const std::string& logger_name, +inline spdlog::async_logger::async_logger(const std::string& name, sink_ptr single_sink, size_t queue_size, const async_overflow_policy overflow_policy, const std::function& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function& worker_teardown_cb) : - async_logger(logger_name, + async_logger(name, { std::move(single_sink) }, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index e2011182..ff62417d 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -14,8 +14,8 @@ // create logger with given name, sinks and the default pattern formatter // all other ctors will call this one template -inline spdlog::logger::logger(std::string logger_name, const It& begin, const It& end): - _name(std::move(logger_name)), +inline spdlog::logger::logger(std::string name, const It& begin, const It& end): + _name(std::move(name)), _sinks(begin, end), _formatter(std::make_shared("%+")), _level(level::info), @@ -30,14 +30,14 @@ inline spdlog::logger::logger(std::string logger_name, const It& begin, const It } // ctor with sinks as init list -inline spdlog::logger::logger(const std::string& logger_name, sinks_init_list sinks_list): - logger(logger_name, sinks_list.begin(), sinks_list.end()) +inline spdlog::logger::logger(const std::string& name, sinks_init_list sinks): + logger(name, sinks.begin(), sinks.end()) {} // ctor with single sink -inline spdlog::logger::logger(const std::string& logger_name, spdlog::sink_ptr single_sink): - logger(logger_name, +inline spdlog::logger::logger(const std::string& name, spdlog::sink_ptr single_sink): + logger(name, { std::move(single_sink) }) diff --git a/include/spdlog/sinks/file_sinks.h b/include/spdlog/sinks/file_sinks.h index 6af7eb7d..6794bdaf 100644 --- a/include/spdlog/sinks/file_sinks.h +++ b/include/spdlog/sinks/file_sinks.h @@ -71,9 +71,7 @@ public: std::size_t max_size, std::size_t max_files) : _base_filename(std::move(base_filename)), _max_size(max_size), - _max_files(max_files), - _current_size(0), - _file_helper() + _max_files(max_files) { _file_helper.open(calc_filename(_base_filename, 0)); _current_size = _file_helper.size(); //expensive. called only once