Changeset 142 in libcf

Timestamp:

07/19/13 10:46:16 (11 years ago)

Author:

cheese

Message:

#1 modify docs and some handle closing routine

Location:

trunk/src

Files:

• cf_debug.c (modified) (5 diffs)
• cf_log.c (modified) (4 diffs)
• cf_mutex.c (modified) (2 diffs)
• cf_socket.c (modified) (1 diff)
• cf_thread.c (modified) (4 diffs)

trunk/src/cf_debug.c

@@ -281 +281 @@
  *
  * \param ctx 디버그 컨텍스트
- *
- * \see CF_DEBUG_DESTROY_CTX
  */
 static int
@@ -306 +304 @@
  *
  * \return 성공 시, CF_Debug_Ctx 형태의 컨텍스트; 실패 시, NULL
- * \see CF_DEBUG_CREATE_CTX
+ *
+ * \param ctx 디버그 컨텍스트
  */
 static int
@@ -343 +342 @@
  *
  * \return 성공 시, CF_OK; 실패 시, 오류 코드
- *
- * \see CF_Debug_Finalize
  */
 int
@@ -380 +377 @@
  * \param func  함수 이름
  * \param line  라인 넘버
- *
- * \see CF_Debug_LeaveFunction
  */
 int
@@ -403 +398 @@
  *
  * \return 성공 시, CF_OK; 실패 시, 오류 코드
- *
- * \see CF_Debug_EnterFunction
  */
 int

trunk/src/cf_log.c

@@ -246 +246 @@
  *
  * \param ctx 로그 컨텍스트
- *
- * \see CF_Log_UnsetMultiThread
  */
 static int
@@ -268 +266 @@
  *
  * \param ctx 로그 컨텍스트
- *
- * \see CF_Log_SetMultiThread
  */
 static int
@@ -474 +470 @@
  *
  * \remarks 반드시 먼저 초기화 해야하며, 초기화 시에 주어진 번호보다 작은 아이디 넘버를 사용
- *
- * \see CF_LOG_OPEN, CF_Log_CreateCtx
  */
 static int
@@ -498 +492 @@
  *
  * \remarks 아이디 넘버에 해당하는 컨텍스트가 해제되므로 주의
- *
- * \see CF_LOG_CLOSE, CF_Log_DestroyCtx
  */
 static int

trunk/src/cf_mutex.c

@@ -29 +29 @@
     MUTEX_TYPE  mid;
 } CF_MUTEX_CTX;
-
-static int
-CF_Mutex_Local_Close (MUTEX_TYPE mid)
-{
-#if defined(_WIN32) || defined(_WIN64)
-    if (mid == NULL)
-        return CF_ERROR_MUTEX_INVALID_ARGS;
-
-    CloseHandle (mid);
-#else
-    pthread_mutex_destroy (&mid);
-#endif
-
-    return CF_OK;
-}
 
 /**
@@ -105 +90 @@
     ASSERT_MUTEX_CTX (ctx);
 
-    CF_Mutex_Local_Close (context->mid);
+#if defined(_WIN32) || defined(_WIN64)
+    if (context->mid == NULL)
+        return CF_ERROR_MUTEX_INVALID_ARGS;
+
+    CloseHandle (context->mid);
+#else
+    pthread_mutex_destroy (&context->mid);
+#endif
+
     free (context);
 

trunk/src/cf_socket.c

@@ -484 +484 @@
  *
  * \param sock  서버 소켓
- *
- * \see CF_Socket_HostInfo
  */
 int

trunk/src/cf_thread.c

@@ -15 +15 @@
 # include <process.h>
 # define THREAD_TYPE    HANDLE
-# define MUTEX_TYPE     HANDLE
 # define THREAD_RETURN  unsigned long   /**< 스레드 워커 함수 반환 형 */
 # define THREAD_CALL    __stdcall
@@ -21 +20 @@
 # include <pthread.h>
 # define THREAD_TYPE    pthread_t
-# define MUTEX_TYPE     pthread_mutex_t
 # define THREAD_RETURN  void *          /**< 스레드 워커 함수 반환 형 */
 # define THREAD_CALL
@@ -38 +36 @@
     void            * arg;
 } CF_THREAD_CTX;
-
-static int
-CF_Thread_Local_Close (THREAD_TYPE tid)
-{
-#if defined(_WIN32) || defined(_WIN64)
-    if (tid == NULL)
-        return CF_ERROR_THREAD_INVALID_ARGS;
-
-    CloseHandle (tid);
-#endif
-
-    return CF_OK;
-}
 
 /**
@@ -159 +144 @@
     ASSERT_THREAD_CTX (ctx);
 
-    CF_Thread_Local_Close (context->tid);
+#if defined(_WIN32) || defined(_WIN64)
+    if (context->tid == NULL)
+        return CF_ERROR_THREAD_INVALID_ARGS;
+
+    CloseHandle (context->tid);
+#endif
     free (context);