diff options
author | gabime <gmelman1@gmail.com> | 2019-11-03 16:19:59 +0300 |
---|---|---|
committer | gabime <gmelman1@gmail.com> | 2019-11-03 16:19:59 +0300 |
commit | cae6c9ab361ffee0e2d7d2e4b89a333c88a1019d (patch) | |
tree | 4f26e1fe05016c7c956d553c1240bfc9e4c3b220 /include | |
parent | 15b393193ad06d839d94011a03960c16369262fd (diff) |
Removed lazy argument evaluation from macros
Diffstat (limited to 'include')
-rw-r--r-- | include/spdlog/details/file_helper-inl.h | 2 | ||||
-rw-r--r-- | include/spdlog/details/os-inl.h | 2 | ||||
-rw-r--r-- | include/spdlog/sinks/systemd_sink.h | 7 | ||||
-rw-r--r-- | include/spdlog/spdlog.h | 7 |
4 files changed, 6 insertions, 12 deletions
diff --git a/include/spdlog/details/file_helper-inl.h b/include/spdlog/details/file_helper-inl.h index 669999b4..3c1d8056 100644 --- a/include/spdlog/details/file_helper-inl.h +++ b/include/spdlog/details/file_helper-inl.h @@ -30,7 +30,7 @@ SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate) close(); filename_ = fname; auto *mode = truncate ? SPDLOG_FILENAME_T("wb") : SPDLOG_FILENAME_T("ab"); - + for (int tries = 0; tries < open_tries_; ++tries) { // create containing folder if not exists already. diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h index 73a464c9..f03cf310 100644 --- a/include/spdlog/details/os-inl.h +++ b/include/spdlog/details/os-inl.h @@ -485,7 +485,7 @@ SPDLOG_INLINE bool create_dir(filename_t path) return true; } - if(path.empty()) + if (path.empty()) { return false; } diff --git a/include/spdlog/sinks/systemd_sink.h b/include/spdlog/sinks/systemd_sink.h index 2887e58e..cee889a4 100644 --- a/include/spdlog/sinks/systemd_sink.h +++ b/include/spdlog/sinks/systemd_sink.h @@ -60,15 +60,14 @@ protected: if (msg.source.empty()) { // Note: function call inside '()' to avoid macro expansion - err = (sd_journal_send)( - "MESSAGE=%.*s", static_cast<int>(length), msg.payload.data(), "PRIORITY=%d", syslog_level(msg.level), + err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), msg.payload.data(), "PRIORITY=%d", syslog_level(msg.level), "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(msg.logger_name.size()), msg.logger_name.data(), nullptr); } else { err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), msg.payload.data(), "PRIORITY=%d", syslog_level(msg.level), - "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(msg.logger_name.size()), msg.logger_name.data(), - "CODE_FILE=%s", msg.source.filename, "CODE_LINE=%d", msg.source.line, "CODE_FUNC=%s", msg.source.funcname, nullptr); + "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(msg.logger_name.size()), msg.logger_name.data(), "CODE_FILE=%s", + msg.source.filename, "CODE_LINE=%d", msg.source.line, "CODE_FUNC=%s", msg.source.funcname, nullptr); } if (err) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 401d22eb..9e0af330 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -285,12 +285,7 @@ inline void critical(wstring_view_t fmt, const Args &... args) // SPDLOG_LEVEL_OFF // -#define SPDLOG_LOGGER_CALL(logger, level, ...) \ - do \ - { \ - if ((logger)->should_log(level) || (logger)->should_backtrace()) \ - (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ - } while (0) +#define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE #define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) |