Changeset 875 for cpp/common

Timestamp:

05/06/19 13:14:56 (6 years ago)

Author:

Maciej Komosinski

Message:

Better use of LOG_level constants

Location:

cpp/common

Files:

• log.cpp (modified) (2 diffs)
• log.h (modified) (2 diffs)
• loggers/loggertostdout.cpp (modified) (2 diffs)

cpp/common/log.cpp

@@ -7 +7 @@
 #include "util-string.h"
 #include "Convert.h"
+#include <assert.h>
 
 const char* LOG_LEVEL_ARRAY[] = { "[DEBUG] ", "", "[WARN] ", "[ERROR] ", "[CRITICAL] " };
@@ -34 +35 @@
 const char* logLevelName(int level)
 {
-        level = min(LOG_CRITICAL, max(LOG_DEBUG, level));
+        assert((level>=LOG_MIN) && (level<=LOG_MAX));
+        level = min(LOG_MAX, max(LOG_MIN, level));
         return LOG_LEVEL_ARRAY[level + 1];
 }

cpp/common/log.h

@@ -20 +20 @@
 
 //level (importance) of a message
+#define LOG_MIN LOG_DEBUG
 #define LOG_DEBUG -1 //debugging information, not needed for final users
 #define LOG_INFO 0 //information
@@ -25 +26 @@
 #define LOG_ERROR 2 //uncorrected error, can cause malfunction
 #define LOG_CRITICAL 3 //serious error, causes side effects. User should save what can be saved and restart the application
+#define LOG_MAX LOG_CRITICAL
 
 #endif

cpp/common/loggers/loggertostdout.cpp

@@ -5 +5 @@
 #include "loggertostdout.h"
 #include <common/console.h>
+#include <assert.h>
 #ifdef SHP
 #include <FBaseSys.h> //AppLog
@@ -36 +37 @@
         else
         {
-                if (level < -1) level = -1; else if (level > 3) level = 3;
+                assert((level>=LOG_MIN) && (level<=LOG_MAX));
+                level = min(LOG_MAX, max(LOG_MIN, level));
                 printf(log_format, log_level[level + 1], obj, method, msg, "\n");
         }