diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
| commit | d3da845a61129c256c3e96fe144ea1dd67bac7c6 (patch) | |
| tree | dd33fccce6c88b0225c609c382bd6c0c211173ae /runtime/queue.c | |
| parent | da75472096c45dd136d41c6e9ad7bf740069d3a1 (diff) | |
| parent | 2181515805e65c37b9db5e0badef2a0a86164234 (diff) | |
| download | rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.gz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.xz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 387c15c2..e4922f37 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -1131,7 +1131,7 @@ cancelWorkers(qqueue_t *pThis) * done when *no* worker is running. So time for a shutdown... -- rgerhards, 2009-05-28 */ DBGOPRINT((obj_t*) pThis, "checking to see if main queue DA worker pool needs to be cancelled\n"); - iRetLocal = wtpCancelAll(pThis->pWtpDA); /* returns immediately if all threads already have terminated */ + wtpCancelAll(pThis->pWtpDA); /* returns immediately if all threads already have terminated */ } RETiRet; |