diff options
author | Michael Biebl <biebl@debian.org> | 2008-11-20 12:49:20 +0100 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2008-11-20 12:49:20 +0100 |
commit | c16d7e48359ded62765f551d05d9b289240a2ec1 (patch) | |
tree | d032d278be583fbd6aa65722d5e30122cb158834 /threads.c | |
parent | 1f6d3725822e3fd676ca66d1b7f841ce2c9c434f (diff) | |
download | rsyslog-c16d7e48359ded62765f551d05d9b289240a2ec1.tar.gz |
Imported Upstream version 3.18.5upstream/3.18.5
Diffstat (limited to 'threads.c')
-rw-r--r-- | threads.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -46,6 +46,7 @@ static linkedList_t llThrds; */ static rsRetVal thrdConstruct(thrdInfo_t **ppThis) { + DEFiRet; thrdInfo_t *pThis; assert(ppThis != NULL); @@ -60,7 +61,7 @@ static rsRetVal thrdConstruct(thrdInfo_t **ppThis) pthread_mutex_init (pThis->mutTermOK, NULL); *ppThis = pThis; - return RS_RET_OK; + RETiRet; } @@ -70,6 +71,7 @@ static rsRetVal thrdConstruct(thrdInfo_t **ppThis) */ static rsRetVal thrdDestruct(thrdInfo_t *pThis) { + DEFiRet; assert(pThis != NULL); if(pThis->bIsActive == 1) { @@ -78,7 +80,7 @@ static rsRetVal thrdDestruct(thrdInfo_t *pThis) free(pThis->mutTermOK); free(pThis); - return RS_RET_OK; + RETiRet; } @@ -86,6 +88,7 @@ static rsRetVal thrdDestruct(thrdInfo_t *pThis) */ rsRetVal thrdTerminate(thrdInfo_t *pThis) { + DEFiRet; assert(pThis != NULL); pthread_cancel(pThis->thrdID); @@ -96,7 +99,7 @@ rsRetVal thrdTerminate(thrdInfo_t *pThis) if(pThis->pAfterRun != NULL) pThis->pAfterRun(pThis); - return RS_RET_OK; + RETiRet; } @@ -104,8 +107,9 @@ rsRetVal thrdTerminate(thrdInfo_t *pThis) */ rsRetVal thrdTerminateAll(void) { + DEFiRet; llDestroy(&llThrds); - return RS_RET_OK; + RETiRet; } |