Changeset 102 in libcf

Timestamp:

05/29/13 00:04:49 (11 years ago)

Author:

cheese

Message:

#1 fix log level check logic

Location:

trunk

Files:

• include/cf_log.h (modified) (3 diffs)
• src/cf_log.c (modified) (3 diffs)

trunk/include/cf_log.h

@@ -19 +19 @@
  * @see CF_Log_Open
  */
-#define CF_LOG_BUFFER_DEFAULT           -1
+#define CF_LOG_BUFFER_DEFAULT   -1
 
 /**
@@ -26 +26 @@
  * @see CF_Log_Open
  */
-#define CF_LOG_BUFFER_NO                0
+#define CF_LOG_BUFFER_NO        0
 
 /**
@@ -33 +33 @@
  * @see CF_Log_Initialize
  */
-#define CF_LOG_NO_LEVEL                 -1
+#define CF_LOG_NO_LEVEL         -1
 
 #ifdef __cplusplus

trunk/src/cf_log.c

@@ -50 +50 @@
         return CF_ERROR_LOG_NOT_MAPPED_ID
 
-#define GET_LOG_LEVEL()                     \
-    ((gLogArray.level == CF_LOG_NO_LEVEL)   \
-     ? gLogArray.ctxSize                    \
-     : gLogArray.level)
-
-#define CHECK_LOG_LEVEL(__mapid)    \
-    if (GET_LOG_LEVEL () < mapid)   \
+#define CHECK_LOG_LEVEL(__mapid)                                        \
+    if (gLogArray.level < mapid)    \
         return CF_OK
 
@@ -534 +529 @@
  */
 int
-CF_Log_Initialize (const int poolSize, const int level)
+CF_Log_Initialize (const int poolSize,
+                   const int level)
 {
     memset (&gLogArray, 0x00, sizeof (CF_LOG_ARRAY));
@@ -545 +541 @@
             return CF_ERROR_LOG_INITIALIZE;
         gLogArray.ctxSize = poolSize;
-        gLogArray.level = level;
+        gLogArray.level = (level == CF_LOG_NO_LEVEL) ? poolSize : level;
     }