Changeset 8 in libcf

Timestamp:

01/30/13 17:25:10 (11 years ago)

Author:

cheese

Message:

#1 remove unnecessary TRY\&CATCH

Location:

trunk

Files:

• include/cf_debug.h (modified) (1 diff)
• src/cf_debug.c (modified) (1 diff)
• src/cf_thread.c (modified) (2 diffs)

trunk/include/cf_debug.h

@@ -19 +19 @@
 #ifdef _DEBUG
 # define CF_DEBUG_TRACE(__ctx,__fmt,...)                            \
-    CF_Debug_Trace (__ctx,__fmt,##__VA_ARGS__)                      \
-
+    CF_Debug_Trace (__ctx,__fmt,##__VA_ARGS__)
 # define CF_DEBUG_TRACE_BIN(__ctx,__bin,__len,__fmt,...)            \
-    CF_Debug_Trace (__ctx,__bin,__len,__fmt,##__VA_ARGS__)          \
-
+    CF_Debug_Trace (__ctx,__bin,__len,__fmt,##__VA_ARGS__)
 # define CF_DEBUG_CALLSTACK_PUSH(__ctx)                             \
-    CF_Debug_CallstackPush (__ctx,__func__,__LINE__)                \
-
+    CF_Debug_CallstackPush (__ctx,__func__,__LINE__)
 # define CF_DEBUG_CALLSTACK_POP                                     \
-    CF_Debug_CallstackPop                                           \
-
+    CF_Debug_CallstackPop
 #else // #ifdef _DEBUG
 # define CF_DEBUG_TRACE(__ctx,__fmt,...)

trunk/src/cf_debug.c

@@ -222 +222 @@
     pop = context->callstack.caller;
     if (pop == NULL)
-    {
         return CF_ERROR_DEBUG_POP_CALLSTACK;
-    }
 
     sprintf (callstack->function, "%s", pop->func);

trunk/src/cf_thread.c

@@ -45 +45 @@
     int result = 0;
 
-    TRY
-    {
 #ifdef _WIN32
-        *threadID = (THREAD_TYPE) _beginthreadex (0, 0, callback, arg, 0, 0);
-        if (*threadID == NULL)
-            result = -1;
+    *threadID = (THREAD_TYPE) _beginthreadex (0, 0, callback, arg, 0, 0);
+    if (*threadID == NULL)
+        return CF_ERROR_THREAD_CREATE;
 #else
-        *threadID = (THREAD_TYPE *) calloc (sizeof (THREAD_TYPE), 1);
-        if (*threadID == NULL)
-        {
-            result = -2;
-            TRY_BREAK;
-        }
+    *threadID = (THREAD_TYPE *) calloc (sizeof (THREAD_TYPE), 1);
+    if (*threadID == NULL)
+        return CF_ERROR_THREAD_CREATE;
 
-        result = pthread_create ((THREAD_TYPE *) *threadID, NULL, callback, arg);
+    result = pthread_create ((THREAD_TYPE *) *threadID, NULL, callback, arg);
+    if (result < 0)
+        return CF_ERROR_THREAD_CREATE;
 #endif
-    }
-    CATCH_IF (result < 0)
-    {
-        return CF_ERROR_THREAD_CREATE;
-    }
 
     return CF_OK;
@@ -100 +92 @@
     int result = 0;
 
-    TRY
-    {
 #ifdef _WIN32
-        *mutex = (MUTEX_TYPE) CreateMutexA (NULL, FALSE, NULL);
-        if (*mutex == NULL)
-        {
-            result = -1;
-            TRY_BREAK;
-        }
+    *mutex = (MUTEX_TYPE) CreateMutexA (NULL, FALSE, NULL);
+    if (*mutex == NULL)
+        return CF_ERROR_MUTEX_CREATE;
 #else
-        *mutex = (MUTEX_TYPE *) calloc (sizeof (MUTEX_TYPE), 1);
-        if (*mutex == NULL)
-        {
-            result = -2;
-            TRY_BREAK;
-        }
+    *mutex = (MUTEX_TYPE *) calloc (sizeof (MUTEX_TYPE), 1);
+    if (*mutex == NULL)
+        return CF_ERROR_MUTEX_CREATE;
 
-        result = pthread_mutex_init (*mutex, NULL);
+    result = pthread_mutex_init (*mutex, NULL);
+    if (result < 0)
+        return CF_ERROR_MUTEX_CREATE;
 #endif
-    }
-    CATCH_IF (result < 0)
-    {
-        return CF_ERROR_MUTEX_CREATE;
-    }
 
     return CF_OK;