summaryrefslogtreecommitdiffstats
path: root/wtp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-27 08:45:38 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-27 08:45:38 +0000
commit3a20ee45be537a98d9da4a7dc994b375ac4a7055 (patch)
tree9e0e1ddfd0d06b8eac5d092acb0ab032267ca791 /wtp.c
parenteb4b1915d1655d801e0232f4196fbdc1af3c857f (diff)
downloadrsyslog-3a20ee45be537a98d9da4a7dc994b375ac4a7055.tar.gz
rsyslog-3a20ee45be537a98d9da4a7dc994b375ac4a7055.tar.xz
rsyslog-3a20ee45be537a98d9da4a7dc994b375ac4a7055.zip
bugfix: queue cancel cleanup handler could be called with invalid pointer
if dequeue failed
Diffstat (limited to 'wtp.c')
-rw-r--r--wtp.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/wtp.c b/wtp.c
index b1745865..599e63c3 100644
--- a/wtp.c
+++ b/wtp.c
@@ -323,8 +323,6 @@ wtpCancelAll(wtp_t *pThis)
{
DEFiRet;
int i;
- int numCancelled = 0;
- /* TODO: mutex?? TODO: cancellation in wti (but OK as is [though ugly form an isolation POV]!) */
ISOBJ_TYPE_assert(pThis, wtp);
@@ -335,10 +333,8 @@ wtpCancelAll(wtp_t *pThis)
for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) {
dbgprintf("%s: try canceling worker thread %d\n", wtpGetDbgHdr(pThis), i);
wtiCancelThrd(pThis->pWrkr[i]);
-RUNLOG;
}
- dbgprintf("%s: cancelled %d worker threads\n", wtpGetDbgHdr(pThis), numCancelled);
RETiRet;
}