Changeset 151 in libcf for trunk/src/cf_mutex.c

Timestamp:

10/31/13 10:17:24 (11 years ago)

Author:

cheese

Message:

#1 fix interface and add util module

File:

• trunk/src/cf_mutex.c (modified) (7 diffs)

trunk/src/cf_mutex.c

@@ -21 +21 @@
 #endif // #if defined(_WIN32) || defined(_WIN64)
 
-#define ASSERT_MUTEX_CTX(__ctx) \
-    if (__ctx == NULL)          \
+#define ASSERT_CTX(__ctx)   \
+    if (__ctx == NULL)      \
         return CF_ERROR_MUTEX_INVALID_CTX
 
@@ -38 +38 @@
  */
 int
-CF_Mutex_CreateCtx (CF_Mutex_Ctx * ctx)
+CF_Mutex_Create (cf_ctx * ctx)
 {
     int result = 0;
@@ -44 +44 @@
     CF_MUTEX_CONTEXT * context = NULL;
 
-    context = (CF_MUTEX_CONTEXT *) calloc (sizeof (CF_MUTEX_CONTEXT), 1);
+    ASSERT_CTX (ctx);
+
+    context = NEWCTX (CF_MUTEX_CONTEXT);
     if (context == NULL)
         return CF_ERROR_MUTEX_CREATE_CTX;
@@ -70 +72 @@
     CATCH_IF (result < 0)
     {
-        CF_Mutex_DestoryCtx ((CF_Mutex_Ctx) context);
+        CF_Mutex_Destory ((cf_ctx) context);
     }
 
@@ -84 +86 @@
  */
 int
-CF_Mutex_DestoryCtx (CF_Mutex_Ctx ctx)
+CF_Mutex_Destory (cf_ctx ctx)
 {
-    CF_MUTEX_CONTEXT * context = ctx;
+    CF_MUTEX_CONTEXT * context = (CF_MUTEX_CONTEXT *) ctx;
 
-    ASSERT_MUTEX_CTX (ctx);
+    ASSERT_CTX (ctx);
 
 #if defined(_WIN32) || defined(_WIN64)
@@ -112 +114 @@
  */
 int
-CF_Mutex_Lock (CF_Mutex_Ctx ctx)
+CF_Mutex_Lock (cf_ctx ctx)
 {
-    CF_MUTEX_CONTEXT * context = ctx;
+    CF_MUTEX_CONTEXT * context = (CF_MUTEX_CONTEXT *) ctx;
 
-    ASSERT_MUTEX_CTX (ctx);
+    ASSERT_CTX (ctx);
 
 #if defined(_WIN32) || defined(_WIN64)
@@ -135 +137 @@
  */
 int
-CF_Mutex_Unlock (CF_Mutex_Ctx ctx)
+CF_Mutex_Unlock (cf_ctx ctx)
 {
-    CF_MUTEX_CONTEXT * context = ctx;
+    CF_MUTEX_CONTEXT * context = (CF_MUTEX_CONTEXT *) ctx;
 
-    ASSERT_MUTEX_CTX (ctx);
+    ASSERT_CTX (ctx);
 
 #if defined(_WIN32) || defined(_WIN64)