From de642b6263e4ffb78e502e46cd8aa553399f159c Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Sun, 25 Feb 2018 12:41:18 +0100 Subject: [PATCH] astyle applied --- include/spdlog/details/async_log_helper.h | 16 ++++++++-------- include/spdlog/details/file_helper.h | 3 ++- include/spdlog/details/os.h | 14 +++++++------- include/spdlog/details/pattern_formatter_impl.h | 3 ++- include/spdlog/sinks/file_sinks.h | 3 ++- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h index 0dbc107c..6faf2f7c 100644 --- a/include/spdlog/details/async_log_helper.h +++ b/include/spdlog/details/async_log_helper.h @@ -64,14 +64,14 @@ class async_log_helper msg_id(0) {} - async_msg(async_msg&& other) SPDLOG_NOEXCEPT : - logger_name(std::move(other.logger_name)), - level(std::move(other.level)), - time(std::move(other.time)), - thread_id(other.thread_id), - txt(std::move(other.txt)), - msg_type(std::move(other.msg_type)), - msg_id(other.msg_id) +async_msg(async_msg&& other) SPDLOG_NOEXCEPT : + logger_name(std::move(other.logger_name)), + level(std::move(other.level)), + time(std::move(other.time)), + thread_id(other.thread_id), + txt(std::move(other.txt)), + msg_type(std::move(other.msg_type)), + msg_id(other.msg_id) {} async_msg& operator=(async_msg&& other) SPDLOG_NOEXCEPT diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h index 996b7b2d..d7ccf59b 100644 --- a/include/spdlog/details/file_helper.h +++ b/include/spdlog/details/file_helper.h @@ -90,7 +90,8 @@ public: size_t size() const { - if (_fd == nullptr) { + if (_fd == nullptr) + { throw spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(_filename)); } return os::filesize(_fd); diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h index eea83013..dc9ef5b3 100644 --- a/include/spdlog/details/os.h +++ b/include/spdlog/details/os.h @@ -81,10 +81,10 @@ inline std::tm localtime(const std::time_t &time_tt) { #ifdef _WIN32 - std::tm tm{}; + std::tm tm {}; localtime_s(&tm, &time_tt); #else - std::tm tm{}; + std::tm tm {}; localtime_r(&time_tt, &tm); #endif return tm; @@ -100,10 +100,10 @@ inline std::tm gmtime(const std::time_t &time_tt) { #ifdef _WIN32 - std::tm tm{}; + std::tm tm {}; gmtime_s(&tm, &time_tt); #else - std::tm tm{}; + std::tm tm {}; gmtime_r(&time_tt, &tm); #endif return tm; @@ -219,7 +219,7 @@ inline bool file_exists(const filename_t& filename) #endif return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY)); #else //common linux/unix all have the stat system call - struct stat buffer{}; + struct stat buffer {}; return (stat(filename.c_str(), &buffer) == 0); #endif } @@ -249,11 +249,11 @@ inline size_t filesize(FILE *f) int fd = fileno(f); //64 bits(but not in osx or cygwin, where fstat64 is deprecated) #if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__) - struct stat64 st{}; + struct stat64 st {}; if (fstat64(fd, &st) == 0) return static_cast(st.st_size); #else // unix 32 bits or cygwin - struct stat st{}; + struct stat st {}; if (fstat(fd, &st) == 0) return static_cast(st.st_size); #endif diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h index 53c96119..b5ee6d02 100644 --- a/include/spdlog/details/pattern_formatter_impl.h +++ b/include/spdlog/details/pattern_formatter_impl.h @@ -648,7 +648,8 @@ inline void spdlog::pattern_formatter::handle_flag(char flag) inline std::tm spdlog::pattern_formatter::get_time(details::log_msg& msg) { - if (_pattern_time == pattern_time_type::local) { + if (_pattern_time == pattern_time_type::local) + { return details::os::localtime(log_clock::to_time_t(msg.time)); } return details::os::gmtime(log_clock::to_time_t(msg.time)); diff --git a/include/spdlog/sinks/file_sinks.h b/include/spdlog/sinks/file_sinks.h index f124117d..39f7b7bb 100644 --- a/include/spdlog/sinks/file_sinks.h +++ b/include/spdlog/sinks/file_sinks.h @@ -235,7 +235,8 @@ private: date.tm_min = _rotation_m; date.tm_sec = 0; auto rotation_time = std::chrono::system_clock::from_time_t(std::mktime(&date)); - if (rotation_time > now) { + if (rotation_time > now) + { return rotation_time; } return{ rotation_time + std::chrono::hours(24) };