Changeset 85 in libcf
- Timestamp:
- 05/03/13 11:16:57 (11 years ago)
- Location:
- trunk/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/cf_codec.c
r73 r85 9 9 #include <stdio.h> 10 10 11 #define ASSERT_ARGS(x) 12 if ((x)) 11 #define ASSERT_ARGS(x) \ 12 if ((x)) \ 13 13 return CF_ERROR_CODEC_INVALID_ARGS 14 14 -
trunk/src/cf_debug.c
r80 r85 21 21 #define IS_READABLE_CHAR(__c) (' ' <= __c && __c <= '~') 22 22 23 #define ASSERT_CTX(__ctx) 24 if (__ctx == NULL) 23 #define ASSERT_CTX(__ctx) \ 24 if (__ctx == NULL) \ 25 25 return CF_ERROR_DEBUG_INVALID_CTX 26 26 -
trunk/src/cf_file.c
r66 r85 47 47 #define FILE_MODE S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH 48 48 49 #define ASSERT_ARGS(x) 50 if ((x)) 49 #define ASSERT_ARGS(x) \ 50 if ((x)) \ 51 51 return CF_ERROR_FILE_INVALID_ARGS 52 52 -
trunk/src/cf_log.c
r67 r85 25 25 #endif 26 26 27 #define ASSERT_CTX(__ctx) (__ctx == NULL) 27 #define ASSERT_CTX(__ctx) \ 28 if (__ctx == NULL) \ 29 return CF_ERROR_LOG_INVALID_CTX 30 31 #define ASSERT_INIT() \ 32 if (gLogArray.ctxPool == NULL || \ 33 gLogArray.ctxSize <= 0 ) \ 34 return CF_ERROR_LOG_NOT_INITIALIZE 35 36 #define ASSERT_MAPID(__mapid) \ 37 if (gLogArray.ctxSize <= __mapid) \ 38 return CF_ERROR_LOG_INVALID_MAPID 39 40 #define ASSERT_MAPPED_CTX(__mapid) \ 41 if (gLogArray.ctxPool[__mapid] != NULL) \ 42 return CF_ERROR_LOG_ALREADY_MAPPED_ID 43 44 #define ASSERT_NOT_MAPPED_CTX(__mapid) \ 45 if (gLogArray.ctxPool[__mapid] == NULL) \ 46 return CF_ERROR_LOG_NOT_MAPPED_ID 47 28 48 #define LOCK_LOG_CTX(__ctx) CF_Mutex_Lock (&__ctx->mutex) 29 49 #define UNLOCK_LOG_CTX(__ctx) CF_Mutex_Unlock (&__ctx->mutex) 30 #define CHECK_INITIALIZED() (gLogArray.ctxPool == NULL|| \31 gLogArray.ctxSize <= 0 )32 #define ASSERT_MAPID(__mapid) (gLogArray.ctxSize <= __mapid)33 #define ASSERT_MAPPED_CTX(__mapid) (gLogArray.ctxPool[__mapid] != NULL)34 50 35 51 #define LOG_BUFFER_DEFAULT_SIZE 128 * 1024 … … 235 251 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 236 252 237 if (ASSERT_CTX (ctx)) 238 return CF_ERROR_LOG_INVALID_CTX; 253 ASSERT_CTX (ctx); 239 254 240 255 if (CF_Mutex_Create (&context->mutex) < 0) … … 258 273 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 259 274 260 if (ASSERT_CTX (ctx)) 261 return CF_ERROR_LOG_INVALID_CTX; 275 ASSERT_CTX (ctx); 262 276 263 277 if (CF_Mutex_Destory (&context->mutex) < 0) … … 289 303 char datetime[LOG_DATETIME_LENGTH + 1] = {0x00,}; 290 304 291 if (ASSERT_CTX (ctx)) 292 return CF_ERROR_LOG_INVALID_CTX; 305 ASSERT_CTX (ctx); 293 306 294 307 LOCK_LOG_CTX (context); … … 319 332 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 320 333 321 if (ASSERT_CTX (ctx)) 322 return CF_ERROR_LOG_INVALID_CTX; 334 ASSERT_CTX (ctx); 323 335 324 336 LOCK_LOG_CTX (context); … … 341 353 CF_LOG_CTX * context = (CF_LOG_CTX *) ctx; 342 354 343 if (ASSERT_CTX (ctx)) 344 return CF_ERROR_LOG_INVALID_CTX; 355 ASSERT_CTX (ctx); 345 356 346 357 if (context->size > 0) … … 441 452 const CF_Log_Ctx ctx) 442 453 { 443 int result = 0; 444 445 TRY 446 { 447 if (CHECK_INITIALIZED ()) 448 { 449 result = CF_ERROR_LOG_NOT_INITIALIZE; 450 TRY_BREAK; 451 } 452 if (ASSERT_MAPID (mapid)) 453 { 454 result = CF_ERROR_LOG_INVALID_MAPID; 455 TRY_BREAK; 456 } 457 if (ASSERT_MAPPED_CTX (mapid)) 458 { 459 result = CF_ERROR_LOG_ALREADY_MAPPED_ID; 460 TRY_BREAK; 461 } 462 } 463 CATCH_IF (result < 0) 464 { 465 CF_Log_DestroyCtx (ctx); 466 return result; 467 } 454 ASSERT_INIT (); 455 ASSERT_MAPID (mapid); 456 ASSERT_MAPPED_CTX (mapid); 468 457 469 458 gLogArray.ctxPool[mapid] = ctx; … … 486 475 CF_Log_UnmapCtxID (const int mapid) 487 476 { 488 if (CHECK_INITIALIZED ()) 489 return CF_ERROR_LOG_NOT_INITIALIZE; 490 if (ASSERT_MAPID (mapid)) 491 return CF_ERROR_LOG_INVALID_MAPID; 492 if (!ASSERT_MAPPED_CTX (mapid)) 493 return CF_ERROR_LOG_NOT_MAPPED_ID; 477 ASSERT_INIT (); 478 ASSERT_MAPID (mapid); 479 ASSERT_NOT_MAPPED_CTX (mapid); 494 480 495 481 CF_Log_DestroyCtx (gLogArray.ctxPool[mapid]); … … 513 499 CF_Log_Ctx * ctx) 514 500 { 515 if (CHECK_INITIALIZED ()) 516 return CF_ERROR_LOG_NOT_INITIALIZE; 517 if (ASSERT_MAPID (mapid)) 518 return CF_ERROR_LOG_INVALID_MAPID; 519 if (!ASSERT_MAPPED_CTX (mapid)) 520 return CF_ERROR_LOG_NOT_MAPPED_ID; 501 ASSERT_INIT (); 502 ASSERT_MAPID (mapid); 503 ASSERT_NOT_MAPPED_CTX (mapid); 521 504 522 505 *ctx = gLogArray.ctxPool[mapid]; … … 596 579 597 580 result = CF_Log_MapCtxID (mapid, ctx); 581 if (result < 0) 582 CF_Log_DestroyCtx (ctx); 598 583 599 584 return result; -
trunk/src/cf_socket.c
r75 r85 30 30 #endif 31 31 32 #define ASSERT_INIT() 33 if (!CF_Socket_IsInitialized ()) 32 #define ASSERT_INIT() \ 33 if (!CF_Socket_IsInitialized ()) \ 34 34 return CF_ERROR_SOCKET_NOT_INITIALIZED 35 35 36 #define ASSERT_SOCKET(__sock) 37 if (__sock < 0) 36 #define ASSERT_SOCKET(__sock) \ 37 if (__sock < 0) \ 38 38 return CF_ERROR_SOCKET_INVALID_SOCKET 39 39 -
trunk/src/cf_thread.c
r84 r85 24 24 #endif // #if defined(_WIN32) || defined(_WIN64) 25 25 26 #define ASSERT_THREAD(__h) 27 if (__h == NULL) 26 #define ASSERT_THREAD(__h) \ 27 if (__h == NULL) \ 28 28 return CF_ERROR_THREAD_INVALID_ARGS 29 29 30 #define ASSERT_MUTEX(__h) 31 if (__h == NULL) 30 #define ASSERT_MUTEX(__h) \ 31 if (__h == NULL) \ 32 32 return CF_ERROR_MUTEX_INVALID_ARGS 33 33
Note:
See TracChangeset
for help on using the changeset viewer.