diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:11:59 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:11:59 +0100 |
commit | 32df7bf254f8e82f4857d9d0f5eeb49d678d08c8 (patch) | |
tree | e4de394adc42e7ac52669fa0467dc94506e36781 /runtime/wtp.c | |
parent | 7d509d53df75bc2146bddebcbab14583474ac543 (diff) | |
parent | 0b5fe246b55635d8eaf3182ddad8961c7d3757c2 (diff) | |
download | rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.tar.gz rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.tar.bz2 rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.zip |
Merge branch 'v6-stable'
Conflicts:
runtime/queue.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 e615fb19..a53a9888 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -309,7 +309,7 @@ wtpWrkrExecCleanup(wti_t *pWti) wtiSetState(pWti, WRKTHRD_STOPPED); ATOMIC_DEC(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd); - DBGPRINTF("%s: Worker thread %lx, terminated, um workers now %d\n", + DBGPRINTF("%s: Worker thread %lx, terminated, num workers now %d\n", wtpGetDbgHdr(pThis), (unsigned long) pWti, ATOMIC_FETCH_32BIT(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd)); |