Changeset 522 for cpp/common

Timestamp:

06/23/16 00:15:59 (9 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

Location:

cpp/common/loggers

Files:

• loggers.cpp (modified) (1 diff)
• loggertostdout.cpp (modified) (1 diff)

cpp/common/loggers/loggers.cpp

@@ -155 +155 @@
 string LoggerToMemory::getCountSummary() const
 {
-if (getInfoCount())
+        if (getInfoCount())
         {
-        string msg;
-        if (getErrorCount())
-                msg=ssprintf("%d error(s)",getErrorCount());
-        int w;
-        if (w=getWarningCount()-getErrorCount())
-                msg+=ssprintf("%s%d warning(s)",(getErrorCount()?", ":""),w);
-        if (w=getInfoCount()-getWarningCount())
-                msg+=ssprintf("%s%d message(s)",(getWarningCount()?", ":""),w);
-        return msg;
+                string msg;
+                if (getErrorCount())
+                        msg = ssprintf("%d error(s)", getErrorCount());
+                int w;
+                if (w = getWarningCount() - getErrorCount())
+                        msg += ssprintf("%s%d warning(s)", (getErrorCount() ? ", " : ""), w);
+                if (w = getInfoCount() - getWarningCount())
+                        msg += ssprintf("%s%d message(s)", (getWarningCount() ? ", " : ""), w);
+                return msg;
         }
-return string("");
+        return string("");
 }
 

cpp/common/loggers/loggertostdout.cpp

@@ -12 +12 @@
 
 static const char* default_log_level_ansicolor[] =
-  { "[\033[2mDEBUG\033[0m] \033[2m", "", "[\033[33mWARN\033[0m] \033[1m", "[\033[1;31mERROR\033[0m] \033[1m", "[\033[1;31mCRITICAL\033[0m] \033[1m" };
+{ "[\033[2mDEBUG\033[0m] \033[2m", "", "[\033[33mWARN\033[0m] \033[1m", "[\033[1;31mERROR\033[0m] \033[1m", "[\033[1;31mCRITICAL\033[0m] \033[1m" };
 
 const char** LoggerToStdout::default_log_level[] =
- { LOG_LEVEL, default_log_level_ansicolor };
+{ LOG_LEVEL, default_log_level_ansicolor };
 
-const char* LoggerToStdout::default_log_format[]= //note trailing %s (so it's easy to append "\n" later)
- { LOG_FORMAT "%s", "%s%s.%s: %s\033[0m%s" };
+const char* LoggerToStdout::default_log_format[] = //note trailing %s (so it's easy to append "\n" later)
+{ LOG_FORMAT "%s", "%s%s.%s: %s\033[0m%s" };
 
 LoggerToStdout::LoggerToStdout(int opts, VirtFILE *_file)
         :LoggerBase(opts), file(_file)
 {
-log_format=default_log_format[console_color_mode];
-log_level=default_log_level[console_color_mode];
+        log_format = default_log_format[console_color_mode];
+        log_level = default_log_level[console_color_mode];
 }