diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
| commit | 4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21 (patch) | |
| tree | 70b8123a9d7d648fe007e8f6c01466e9b26fd4e1 /runtime/wtp.c | |
| parent | c4c20c18aae7c95c1e69c10d2ea9efbc3c2c1913 (diff) | |
| parent | 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff) | |
| download | rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.gz rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.xz rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
runtime/parser.c
Diffstat (limited to 'runtime/wtp.c')
| -rw-r--r-- | runtime/wtp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c index fff37c2f..b4fd2e04 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -478,7 +478,7 @@ wtpWorker(void *arg) /* the arg is actually a wti object, even though we are in do { END_MTX_PROTECTED_OPERATIONS(&pThis->mut); - iRet = wtiWorker(pWti); /* just to make sure: this is NOT protected by the mutex! */ + wtiWorker(pWti); /* just to make sure: this is NOT protected by the mutex! */ BEGIN_MTX_PROTECTED_OPERATIONS(&pThis->mut, LOCK_MUTEX); } while(pThis->iCurNumWrkThrd == 1 && pThis->bInactivityGuard == 1); |