From d1819f5f76d4b2bca83fc8f26fb7d2b3ed20baed Mon Sep 17 00:00:00 2001 From: gabime Date: Sun, 15 Mar 2020 18:51:52 +0200 Subject: [PATCH] clang-format --- include/spdlog/common.h | 20 ++++++++++---------- include/spdlog/details/registry-inl.h | 2 +- include/spdlog/details/tcp_client-windows.h | 19 ++++++++----------- include/spdlog/sinks/tcp_sink.h | 8 ++++---- src/color_sinks.cpp | 12 ++++++++---- tests/test_misc.cpp | 10 ++++------ 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/include/spdlog/common.h b/include/spdlog/common.h index aa94e794..72a0e446 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -17,16 +17,16 @@ #ifdef SPDLOG_COMPILED_LIB #undef SPDLOG_HEADER_ONLY -# if defined(_WIN32) && defined(SPDLOG_SHARED_LIB) -# ifdef spdlog_EXPORTS -# define SPDLOG_API __declspec(dllexport) -# else -# define SPDLOG_API __declspec(dllimport) -# endif -# else -# define SPDLOG_API -# endif -# define SPDLOG_INLINE +#if defined(_WIN32) && defined(SPDLOG_SHARED_LIB) +#ifdef spdlog_EXPORTS +#define SPDLOG_API __declspec(dllexport) +#else +#define SPDLOG_API __declspec(dllimport) +#endif +#else +#define SPDLOG_API +#endif +#define SPDLOG_INLINE #else #define SPDLOG_API #define SPDLOG_HEADER_ONLY diff --git a/include/spdlog/details/registry-inl.h b/include/spdlog/details/registry-inl.h index a6cfc54c..ff6e9773 100644 --- a/include/spdlog/details/registry-inl.h +++ b/include/spdlog/details/registry-inl.h @@ -187,7 +187,7 @@ SPDLOG_INLINE void registry::flush_on(level::level_enum log_level) SPDLOG_INLINE void registry::flush_every(std::chrono::seconds interval) { std::lock_guard lock(flusher_mutex_); - auto clbk = [this](){this->flush_all();}; + auto clbk = [this]() { this->flush_all(); }; periodic_flusher_ = details::make_unique(clbk, interval); } diff --git a/include/spdlog/details/tcp_client-windows.h b/include/spdlog/details/tcp_client-windows.h index fa16f2fb..fb67351f 100644 --- a/include/spdlog/details/tcp_client-windows.h +++ b/include/spdlog/details/tcp_client-windows.h @@ -49,14 +49,11 @@ class tcp_client } } - static void throw_winsock_error_(const std::string& msg, int last_error) + static void throw_winsock_error_(const std::string &msg, int last_error) { char buf[512]; - ::FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - last_error, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - buf, (sizeof(buf) / sizeof(char)), NULL); + ::FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, last_error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (sizeof(buf) / sizeof(char)), NULL); SPDLOG_THROW(spdlog_ex(fmt::format("tcp_sink - {}: {}", msg, buf))); } @@ -111,20 +108,20 @@ public: auto rv = ::getaddrinfo(host.c_str(), port_str.c_str(), &hints, &addrinfo_result); int last_error = 0; if (rv != 0) - { + { last_error = ::WSAGetLastError(); WSACleanup(); throw_winsock_error_("getaddrinfo failed", last_error); } // Try each address until we successfully connect(2). - + for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next) { socket_ = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); if (socket_ == INVALID_SOCKET) { - last_error = ::WSAGetLastError(); + last_error = ::WSAGetLastError(); WSACleanup(); continue; } @@ -141,7 +138,7 @@ public: ::freeaddrinfo(addrinfo_result); if (socket_ == INVALID_SOCKET) { - WSACleanup(); + WSACleanup(); throw_winsock_error_("connect failed", last_error); } @@ -160,7 +157,7 @@ public: const int send_flags = 0; auto write_result = ::send(socket_, data + bytes_sent, (int)(n_bytes - bytes_sent), send_flags); if (write_result == SOCKET_ERROR) - { + { int last_error = ::WSAGetLastError(); close(); throw_winsock_error_("send failed", last_error); diff --git a/include/spdlog/sinks/tcp_sink.h b/include/spdlog/sinks/tcp_sink.h index 3983b539..9dd9e51d 100644 --- a/include/spdlog/sinks/tcp_sink.h +++ b/include/spdlog/sinks/tcp_sink.h @@ -31,7 +31,7 @@ struct tcp_sink_config { std::string server_host; int server_port; - bool lazy_connect = false; // if true connect on first log call instead of on construction + bool lazy_connect = false; // if true connect on first log call instead of on construction tcp_sink_config(std::string host, int port) : server_host{std::move(host)} @@ -46,14 +46,14 @@ public: // connect to tcp host/port or throw if failed // host can be hostname or ip address - explicit tcp_sink(tcp_sink_config sink_config): - config_{std::move(sink_config)} + explicit tcp_sink(tcp_sink_config sink_config) + : config_{std::move(sink_config)} { if (!config_.lazy_connect) { this->client_.connect(config_.server_host, config_.server_port); } - } + } ~tcp_sink() override = default; diff --git a/src/color_sinks.cpp b/src/color_sinks.cpp index 4fc13820..e5de1854 100644 --- a/src/color_sinks.cpp +++ b/src/color_sinks.cpp @@ -41,7 +41,11 @@ template SPDLOG_API std::shared_ptr spdlog::stderr_color_mt spdlog::stderr_color_st( const std::string &logger_name, color_mode mode); -template SPDLOG_API std::shared_ptr spdlog::stdout_color_mt(const std::string &logger_name, color_mode mode); -template SPDLOG_API std::shared_ptr spdlog::stdout_color_st(const std::string &logger_name, color_mode mode); -template SPDLOG_API std::shared_ptr spdlog::stderr_color_mt(const std::string &logger_name, color_mode mode); -template SPDLOG_API std::shared_ptr spdlog::stderr_color_st(const std::string &logger_name, color_mode mode); +template SPDLOG_API std::shared_ptr spdlog::stdout_color_mt( + const std::string &logger_name, color_mode mode); +template SPDLOG_API std::shared_ptr spdlog::stdout_color_st( + const std::string &logger_name, color_mode mode); +template SPDLOG_API std::shared_ptr spdlog::stderr_color_mt( + const std::string &logger_name, color_mode mode); +template SPDLOG_API std::shared_ptr spdlog::stderr_color_st( + const std::string &logger_name, color_mode mode); diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp index c7cbe239..6486e116 100644 --- a/tests/test_misc.cpp +++ b/tests/test_misc.cpp @@ -209,14 +209,12 @@ TEST_CASE("to_hex_different_size_per_line", "[to_hex]") REQUIRE(ends_with(oss.str(), "0000: 090A0B410C4BFFFF" + std::string(spdlog::details::os::default_eol))); oss_logger.info("{:Xsa}", spdlog::to_hex(v, 6)); - REQUIRE(ends_with(oss.str(), - "0000: 090A0B410C4B ...A.K" + std::string(spdlog::details::os::default_eol) - + "0006: FFFF .." + std::string(spdlog::details::os::default_eol))); + REQUIRE(ends_with(oss.str(), "0000: 090A0B410C4B ...A.K" + std::string(spdlog::details::os::default_eol) + "0006: FFFF .." + + std::string(spdlog::details::os::default_eol))); oss_logger.info("{:Xs}", spdlog::to_hex(v, 6)); - REQUIRE(ends_with(oss.str(), - "0000: 090A0B410C4B" + std::string(spdlog::details::os::default_eol) - + "0006: FFFF" + std::string(spdlog::details::os::default_eol))); + REQUIRE(ends_with(oss.str(), "0000: 090A0B410C4B" + std::string(spdlog::details::os::default_eol) + "0006: FFFF" + + std::string(spdlog::details::os::default_eol))); } TEST_CASE("to_hex_no_ascii", "[to_hex]")