summaryrefslogtreecommitdiffstats
path: root/threads.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-15 12:59:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-15 12:59:24 +0200
commit8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a (patch)
tree21a5726fa380372c08e8975e9c49f9bb6d91feb0 /threads.c
parenta61e548958044f9efa013b5911d130ae1930448f (diff)
parent3f2856b4b5010dfcaa720b292dc3a655e7b9f6da (diff)
downloadrsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.tar.gz
rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.tar.xz
rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/rsyslog_ng_comparison.html
Diffstat (limited to 'threads.c')
-rw-r--r--threads.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/threads.c b/threads.c
index f4f604fc..61ea8f29 100644
--- a/threads.c
+++ b/threads.c
@@ -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;
}