bugfix in color detection and astyle

include/spdlog/details/async_log_helper.h

@@ -56,7 +56,7 @@ class async_log_helper
         ~async_msg() = default;
 
 
-        async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
+async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
         logger_name(std::move(other.logger_name)),
                     level(std::move(other.level)),
                     time(std::move(other.time)),

include/spdlog/details/os.h

@@ -365,14 +365,19 @@ inline std::string filename_to_str(const filename_t& filename)
 }
 #endif
 
-inline std::string errno_to_string(char [256], char* res) {
+inline std::string errno_to_string(char [256], char* res)
+{
     return std::string(res);
 }
 
-inline std::string errno_to_string(char buf[256], int res) {
-    if (res == 0) {
+inline std::string errno_to_string(char buf[256], int res)
+{
+    if (res == 0)
+    {
         return std::string(buf);
-    } else {
+    }
+    else
+    {
         return "Unknown error";
     }
 }
@@ -422,20 +427,24 @@ bool is_color_terminal()
 #ifdef _WIN32
     return true;
 #else
-	static constexpr const char* Terms[] = {
+    static constexpr const char* Terms[] =
+    {
         "ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm",
         "linux", "msys", "putty", "rxvt", "screen", "vt100", "xterm"
     };
 
     const char *env_p = std::getenv("TERM");
-	if (env_p == nullptr) {
+    if (env_p == nullptr)
+    {
         return false;
     }
 
     static const bool result = std::any_of(
-		std::begin(Terms), std::end(Terms), [&](const char* term) {
+                                   std::begin(Terms), std::end(Terms), [&](const char* term)
+    {
         return std::strstr(env_p, term) != nullptr;
     });
+    return result;
 #endif
 }
 

include/spdlog/sinks/android_sink.h

@@ -31,7 +31,7 @@ namespace sinks
 class android_sink : public sink
 {
 public:
-    explicit android_sink(const std::string& tag = "spdlog", bool use_raw_msg = false): _tag(tag), _use_raw_msg(use_raw_msg){}
+    explicit android_sink(const std::string& tag = "spdlog", bool use_raw_msg = false): _tag(tag), _use_raw_msg(use_raw_msg) {}
 
     void log(const details::log_msg& msg) override
     {

include/spdlog/sinks/ansicolor_sink.h

@@ -14,17 +14,17 @@
 
 namespace spdlog
 {
-	namespace sinks
-	{
+namespace sinks
+{
 
-		/**
+/**
  * @brief The ansi_color_sink is a decorator around another sink and prefixes
  * the output with an ANSI escape sequence color code depending on the severity
  * of the message.
  */
-		class ansicolor_sink SPDLOG_FINAL: public sink
-		{
-		public:
+class ansicolor_sink SPDLOG_FINAL: public sink
+{
+public:
     ansicolor_sink(sink_ptr wrapped_sink);
     virtual ~ansicolor_sink();
 
@@ -66,14 +66,14 @@ namespace spdlog
     const std::string on_white = "\033[47m";
 
 
-		protected:
+protected:
     bool is_color_terminal_;
     sink_ptr sink_;
     std::map<level::level_enum, std::string> colors_;
-		};
+};
 
-		inline ansicolor_sink::ansicolor_sink(sink_ptr wrapped_sink): sink_(wrapped_sink)
-		{
+inline ansicolor_sink::ansicolor_sink(sink_ptr wrapped_sink): sink_(wrapped_sink)
+{
     is_color_terminal_ = details::os::is_color_terminal();
     colors_[level::trace] = cyan;
     colors_[level::debug] = cyan;
@@ -82,13 +82,14 @@ namespace spdlog
     colors_[level::err] = red + bold;
     colors_[level::critical] = bold + on_red;
     colors_[level::off] = reset;
-		}
+}
 
-		inline void ansicolor_sink::log(const details::log_msg& msg)
-		{
+inline void ansicolor_sink::log(const details::log_msg& msg)
+{
     // Wrap the originally formatted message in color codes.
     // If color is not supported in the terminal, log as is instead.
-			if (is_color_terminal_) {
+    if (is_color_terminal_)
+    {
         const std::string& prefix = colors_[msg.level];
         const std::string& s = msg.formatted.str();
         const std::string& suffix = reset;
@@ -100,26 +101,27 @@ namespace spdlog
         m.formatted << prefix << s << suffix;
         sink_->log(m);
     }
-			else {
+    else
+    {
         sink_->log(msg);
     }
-		}
+}
 
-		inline void ansicolor_sink::flush()
-		{
+inline void ansicolor_sink::flush()
+{
     sink_->flush();
-		}
+}
 
-		inline void ansicolor_sink::set_color(level::level_enum color_level, const std::string& color)
-		{
+inline void ansicolor_sink::set_color(level::level_enum color_level, const std::string& color)
+{
     colors_[color_level] = color;
-		}
+}
 
-		inline ansicolor_sink::~ansicolor_sink()
-		{
+inline ansicolor_sink::~ansicolor_sink()
+{
     flush();
-		}
+}
 
-	} // namespace sinks
+} // namespace sinks
 } // namespace spdlog