summaryrefslogtreecommitdiffstats
path: root/threads.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-16 13:59:16 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-16 13:59:16 +0100
commit189a26c0444178612bf6e4618ccd9c722b83c261 (patch)
tree243d27b68a14ebcd2c7263a3492ace23542c5f13 /threads.c
parentc5611012f9d82155d6017435b5cf52c0b4e31149 (diff)
parent371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff)
downloadrsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.gz
rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.xz
rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
Diffstat (limited to 'threads.c')
-rw-r--r--threads.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/threads.c b/threads.c
index 4064fc7a..04ccb8d3 100644
--- a/threads.c
+++ b/threads.c
@@ -211,7 +211,6 @@ rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), rsRetVal(*afterRun)(thrdI
{
DEFiRet;
thrdInfo_t *pThis;
- int i;
assert(thrdMain != NULL);
@@ -220,7 +219,7 @@ rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), rsRetVal(*afterRun)(thrdI
pThis->pUsrThrdMain = thrdMain;
pThis->pAfterRun = afterRun;
pThis->bNeedsCancel = bNeedsCancel;
- i = pthread_create(&pThis->thrdID, NULL, thrdStarter, pThis);
+ pthread_create(&pThis->thrdID, NULL, thrdStarter, pThis);
CHKiRet(llAppend(&llThrds, NULL, pThis));
finalize_it: