Changeset 55 in libcf for trunk/src/cf_log.c

Timestamp:

04/06/13 21:44:24 (11 years ago)

Author:

cheese

Message:

#1 arrange definition and fix for windows

File:

• trunk/src/cf_log.c (modified) (9 diffs)

trunk/src/cf_log.c

@@ -27 +27 @@
 #endif
 
-#define CHECK_INVALID_CTX(__ctx)        (__ctx == NULL)
+#define ASSERT_CTX(__ctx)               (__ctx == NULL)
 #define LOCK_LOG_CTX(__ctx)             CF_Mutex_Lock (&__ctx->mutex)
 #define UNLOCK_LOG_CTX(__ctx)           CF_Mutex_Unlock (&__ctx->mutex)
 #define CHECK_INITIALIZED()             (gLogArray.ctxPool == NULL||    \
                                          gLogArray.ctxSize <= 0 )
-#define CHECK_INVALID_MAPID(__mapid)    (gLogArray.ctxSize <= __mapid)
-#define CHECK_MAPPED_ID(__mapid)        (gLogArray.ctxPool[__mapid] != NULL)
+#define ASSERT_MAPID(__mapid)           (gLogArray.ctxSize <= __mapid)
+#define ASSERT_MAPPED_CTX(__mapid)      (gLogArray.ctxPool[__mapid] != NULL)
 
 #define LOG_BUFFER_DEFAULT_SIZE         128 * 1024
@@ -242 +242 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    if (CHECK_INVALID_CTX (ctx))
+    if (ASSERT_CTX (ctx))
         return CF_ERROR_LOG_INVALID_CTX;
 
@@ -265 +265 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    if (CHECK_INVALID_CTX (ctx))
+    if (ASSERT_CTX (ctx))
         return CF_ERROR_LOG_INVALID_CTX;
 
@@ -296 +296 @@
     char        datetime[LOG_DATETIME_LENGTH + 1] = {0x00,};
 
-    if (CHECK_INVALID_CTX (ctx))
+    if (ASSERT_CTX (ctx))
         return CF_ERROR_LOG_INVALID_CTX;
 
@@ -326 +326 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    if (CHECK_INVALID_CTX (ctx))
+    if (ASSERT_CTX (ctx))
         return CF_ERROR_LOG_INVALID_CTX;
 
@@ -348 +348 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    if (CHECK_INVALID_CTX (ctx))
+    if (ASSERT_CTX (ctx))
         return CF_ERROR_LOG_INVALID_CTX;
 
@@ -457 +457 @@
             TRY_BREAK;
         }
-        if (CHECK_INVALID_MAPID (mapid))
+        if (ASSERT_MAPID (mapid))
         {
             result = CF_ERROR_LOG_INVALID_MAPID;
             TRY_BREAK;
         }
-        if (CHECK_MAPPED_ID (mapid))
+        if (ASSERT_MAPPED_CTX (mapid))
         {
             result = CF_ERROR_LOG_ALREADY_MAPPED_ID;
@@ -495 +495 @@
     if (CHECK_INITIALIZED ())
         return CF_ERROR_LOG_NOT_INITIALIZE;
-    if (CHECK_INVALID_MAPID (mapid))
+    if (ASSERT_MAPID (mapid))
         return CF_ERROR_LOG_INVALID_MAPID;
-    if (!CHECK_MAPPED_ID (mapid))
+    if (!ASSERT_MAPPED_CTX (mapid))
         return CF_ERROR_LOG_NOT_MAPPED_ID;
 
@@ -522 +522 @@
     if (CHECK_INITIALIZED ())
         return CF_ERROR_LOG_NOT_INITIALIZE;
-    if (CHECK_INVALID_MAPID (mapid))
+    if (ASSERT_MAPID (mapid))
         return CF_ERROR_LOG_INVALID_MAPID;
-    if (!CHECK_MAPPED_ID (mapid))
+    if (!ASSERT_MAPPED_CTX (mapid))
         return CF_ERROR_LOG_NOT_MAPPED_ID;