Changeset 55 in libcf
- Timestamp:
- 04/06/13 21:44:24 (11 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/cf_debug.c
r53 r55 22 22 #define IS_READABLE_CHAR(__c) (' ' <= __c && __c <= '~') 23 23 24 #define CHECK_INVALID_CTX(__ctx)\24 #define ASSERT_CTX(__ctx) \ 25 25 if (__ctx == NULL) \ 26 26 return CF_ERROR_DEBUG_INVALID_CTX … … 82 82 CF_DEBUG_CTX * context = (CF_DEBUG_CTX *) ctx; 83 83 84 CHECK_INVALID_CTX (ctx);84 ASSERT_CTX (ctx); 85 85 86 86 strncpy (context->file, file, strlen (file)); … … 156 156 CF_DEBUG_CALLSTACK * next = NULL; 157 157 158 CHECK_INVALID_CTX (ctx);158 ASSERT_CTX (ctx); 159 159 160 160 if (context->fp != NULL) … … 297 297 CF_DEBUG_CALLSTACK * push = NULL; 298 298 299 CHECK_INVALID_CTX (ctx);299 ASSERT_CTX (ctx); 300 300 301 301 push = (CF_DEBUG_CALLSTACK *) calloc (sizeof (CF_DEBUG_CALLSTACK), 1); … … 366 366 CF_DEBUG_CALLSTACK * pop = NULL; 367 367 368 CHECK_INVALID_CTX (ctx);368 ASSERT_CTX (ctx); 369 369 370 370 pop = context->callstack.caller; -
trunk/src/cf_file.c
r50 r55 13 13 #if defined(_WIN32) || defined(_WIN64) 14 14 # include <io.h> 15 # include <direct.h> 15 16 16 17 # define DELIMITER '\\' 17 18 # define mkdir(a,b) _mkdir (a) 18 19 # define access(a,b) _access (a,b) 20 # define snprintf _snprintf 19 21 20 22 # define F_OK 0 … … 46 48 #define FILE_MODE S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH 47 49 50 #define ASSERT_ARGS(x) \ 51 if ((x)) \ 52 return CF_ERROR_FILE_INVALID_ARGS 53 48 54 /** 49 55 * 파일 열기 … … 60 66 const CF_FILE_FLAG flag) 61 67 { 62 int result = open (path, (int)(flag|O_BINARY)); 68 int result = 0; 69 70 ASSERT_ARGS (path == NULL); 71 72 result = open (path, (int)(flag|O_BINARY)); 63 73 64 74 if (result < 0) … … 78 88 CF_File_Create (const char * path) 79 89 { 80 int result = open (path, CF_FILE_CR|CF_FILE_WO|CF_FILE_TR, FILE_MODE); 90 int result = 0; 91 92 ASSERT_ARGS (path == NULL); 93 94 result = open (path, CF_FILE_CR|CF_FILE_WO|CF_FILE_TR, FILE_MODE); 81 95 82 96 if (result < 0) … … 98 112 int result = 0; 99 113 100 if (fd < 0) 101 return CF_ERROR_FILE_INVALID_ARGS; 114 ASSERT_ARGS (fd < 0); 102 115 103 116 result = close (fd); … … 123 136 const size_t len) 124 137 { 125 int result = (int) read (fd, buf, len); 138 int result = 0; 139 140 ASSERT_ARGS (fd < 0); 141 ASSERT_ARGS (buf == NULL); 142 143 result = (int) read (fd, buf, len); 126 144 127 145 if (result < 0) … … 145 163 const size_t len) 146 164 { 147 int result = (int) write (fd, buf, len); 165 int result = 0; 166 167 ASSERT_ARGS (fd < 0); 168 ASSERT_ARGS (buf == NULL); 169 170 (int) write (fd, buf, len); 148 171 149 172 if (result != len) … … 163 186 CF_File_GetSize (const int fd) 164 187 { 165 int result = (int) lseek (fd, 0, SEEK_END); 188 int result = 0; 189 190 ASSERT_ARGS (fd < 0); 191 192 (int) lseek (fd, 0, SEEK_END); 166 193 167 194 if (result < 0 || lseek (fd, 0, SEEK_SET) < 0) … … 187 214 char * f = fullPath; 188 215 char * d = stepPath; 216 217 ASSERT_ARGS (path == NULL); 189 218 190 219 snprintf (fullPath, sizeof (fullPath) - 1, "%s%c", path, DELIMITER); -
trunk/src/cf_log.c
r51 r55 27 27 #endif 28 28 29 #define CHECK_INVALID_CTX(__ctx)(__ctx == NULL)29 #define ASSERT_CTX(__ctx) (__ctx == NULL) 30 30 #define LOCK_LOG_CTX(__ctx) CF_Mutex_Lock (&__ctx->mutex) 31 31 #define UNLOCK_LOG_CTX(__ctx) CF_Mutex_Unlock (&__ctx->mutex) 32 32 #define CHECK_INITIALIZED() (gLogArray.ctxPool == NULL|| \ 33 33 gLogArray.ctxSize <= 0 ) 34 #define CHECK_INVALID_MAPID(__mapid)(gLogArray.ctxSize <= __mapid)35 #define CHECK_MAPPED_ID(__mapid) (gLogArray.ctxPool[__mapid] != NULL)34 #define ASSERT_MAPID(__mapid) (gLogArray.ctxSize <= __mapid) 35 #define ASSERT_MAPPED_CTX(__mapid) (gLogArray.ctxPool[__mapid] != NULL) 36 36 37 37 #define LOG_BUFFER_DEFAULT_SIZE 128 * 1024 … … 242 242 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 243 243 244 if ( CHECK_INVALID_CTX (ctx))244 if (ASSERT_CTX (ctx)) 245 245 return CF_ERROR_LOG_INVALID_CTX; 246 246 … … 265 265 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 266 266 267 if ( CHECK_INVALID_CTX (ctx))267 if (ASSERT_CTX (ctx)) 268 268 return CF_ERROR_LOG_INVALID_CTX; 269 269 … … 296 296 char datetime[LOG_DATETIME_LENGTH + 1] = {0x00,}; 297 297 298 if ( CHECK_INVALID_CTX (ctx))298 if (ASSERT_CTX (ctx)) 299 299 return CF_ERROR_LOG_INVALID_CTX; 300 300 … … 326 326 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 327 327 328 if ( CHECK_INVALID_CTX (ctx))328 if (ASSERT_CTX (ctx)) 329 329 return CF_ERROR_LOG_INVALID_CTX; 330 330 … … 348 348 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 349 349 350 if ( CHECK_INVALID_CTX (ctx))350 if (ASSERT_CTX (ctx)) 351 351 return CF_ERROR_LOG_INVALID_CTX; 352 352 … … 457 457 TRY_BREAK; 458 458 } 459 if ( CHECK_INVALID_MAPID (mapid))459 if (ASSERT_MAPID (mapid)) 460 460 { 461 461 result = CF_ERROR_LOG_INVALID_MAPID; 462 462 TRY_BREAK; 463 463 } 464 if ( CHECK_MAPPED_ID(mapid))464 if (ASSERT_MAPPED_CTX (mapid)) 465 465 { 466 466 result = CF_ERROR_LOG_ALREADY_MAPPED_ID; … … 495 495 if (CHECK_INITIALIZED ()) 496 496 return CF_ERROR_LOG_NOT_INITIALIZE; 497 if ( CHECK_INVALID_MAPID (mapid))497 if (ASSERT_MAPID (mapid)) 498 498 return CF_ERROR_LOG_INVALID_MAPID; 499 if (! CHECK_MAPPED_ID(mapid))499 if (!ASSERT_MAPPED_CTX (mapid)) 500 500 return CF_ERROR_LOG_NOT_MAPPED_ID; 501 501 … … 522 522 if (CHECK_INITIALIZED ()) 523 523 return CF_ERROR_LOG_NOT_INITIALIZE; 524 if ( CHECK_INVALID_MAPID (mapid))524 if (ASSERT_MAPID (mapid)) 525 525 return CF_ERROR_LOG_INVALID_MAPID; 526 if (! CHECK_MAPPED_ID(mapid))526 if (!ASSERT_MAPPED_CTX (mapid)) 527 527 return CF_ERROR_LOG_NOT_MAPPED_ID; 528 528 -
trunk/src/cf_socket.c
r53 r55 29 29 #endif 30 30 31 #define CHECK_SOCKET_INIT()\31 #define ASSERT_INIT() \ 32 32 if (!CF_Socket_IsInitialized ()) \ 33 33 return CF_ERROR_SOCKET_NOT_INITIALIZED 34 34 35 #define CHECK_INVALID_SOCKET(__sock)\35 #define ASSERT_SOCKET(__sock) \ 36 36 if (__sock < 0) \ 37 37 return CF_ERROR_SOCKET_INVALID_SOCKET … … 169 169 CF_Socket_Finalize (void) 170 170 { 171 CHECK_SOCKET_INIT ();171 ASSERT_INIT (); 172 172 173 173 #if defined(_WIN32) || defined(_WIN64) … … 191 191 int result = 0; 192 192 193 CHECK_INVALID_SOCKET (sock);193 ASSERT_SOCKET (sock); 194 194 195 195 result = close (sock); … … 219 219 int result = 0; 220 220 221 CHECK_INVALID_SOCKET (sock);221 ASSERT_SOCKET (sock); 222 222 223 223 result = setsockopt (sock, … … 254 254 int result = 0; 255 255 256 CHECK_INVALID_SOCKET (sock);256 ASSERT_SOCKET (sock); 257 257 258 258 result = getsockopt (sock, … … 313 313 fd_set writefds; 314 314 315 CHECK_SOCKET_INIT ();315 ASSERT_INIT (); 316 316 317 317 /* 1. create socket */ … … 434 434 struct sockaddr_in address; 435 435 436 CHECK_SOCKET_INIT ();436 ASSERT_INIT (); 437 437 438 438 sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); … … 492 492 socklen_t len = sizeof (address); 493 493 494 CHECK_INVALID_SOCKET (sock);494 ASSERT_SOCKET (sock); 495 495 496 496 sockClient = accept (sock, (struct sockaddr *) &address, &len); … … 538 538 int result = 0; 539 539 540 CHECK_INVALID_SOCKET (sock);540 ASSERT_SOCKET (sock); 541 541 542 542 result = (int) send (sock, buf, (size_t) len, 0); … … 584 584 int result = 0; 585 585 586 CHECK_INVALID_SOCKET (sock);586 ASSERT_SOCKET (sock); 587 587 588 588 TRY -
trunk/src/cf_thread.c
r50 r55 21 21 #endif // #if defined(_WIN32) || defined(_WIN64) 22 22 23 #define CHECK_INVALID_THREAD(__h)\23 #define ASSERT_THREAD(__h) \ 24 24 if (__h == NULL) \ 25 25 return CF_ERROR_THREAD_INVALID_ARGS 26 26 27 #define CHECK_INVALID_MUTEX(__h)\27 #define ASSERT_MUTEX(__h) \ 28 28 if (__h == NULL) \ 29 29 return CF_ERROR_MUTEX_INVALID_ARGS … … 86 86 CF_Thread_Release (CF_Thread * threadID) 87 87 { 88 CHECK_INVALID_THREAD (*threadID);88 ASSERT_THREAD (*threadID); 89 89 90 90 CF_Thread_Local_Close (*threadID); … … 103 103 CF_Thread_Join (CF_Thread * threadID) 104 104 { 105 CHECK_INVALID_THREAD (*threadID);105 ASSERT_THREAD (*threadID); 106 106 107 107 #if defined(_WIN32) || defined(_WIN64) … … 156 156 CF_Mutex_Destory (CF_Mutex * mutex) 157 157 { 158 CHECK_INVALID_MUTEX (*mutex);158 ASSERT_MUTEX (*mutex); 159 159 160 160 CF_Thread_Local_Close (*mutex); … … 173 173 CF_Mutex_Lock (CF_Mutex * mutex) 174 174 { 175 CHECK_INVALID_MUTEX (*mutex);175 ASSERT_MUTEX (*mutex); 176 176 177 177 #if defined(_WIN32) || defined(_WIN64) … … 194 194 CF_Mutex_Unlock (CF_Mutex * mutex) 195 195 { 196 CHECK_INVALID_MUTEX (*mutex);196 ASSERT_MUTEX (*mutex); 197 197 198 198 #if defined(_WIN32) || defined(_WIN64) -
trunk/windows/libcf/libcf.vcproj
r20 r55 214 214 </File> 215 215 <File 216 RelativePath="..\..\include\cf_error.h" 217 > 218 </File> 219 <File 216 220 RelativePath="..\..\include\cf_file.h" 217 221 >
Note:
See TracChangeset
for help on using the changeset viewer.