diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:59:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:59:16 +0100 |
| commit | 189a26c0444178612bf6e4618ccd9c722b83c261 (patch) | |
| tree | 243d27b68a14ebcd2c7263a3492ace23542c5f13 /runtime/cfsysline.c | |
| parent | c5611012f9d82155d6017435b5cf52c0b4e31149 (diff) | |
| parent | 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff) | |
| download | rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.gz rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.bz2 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 'runtime/cfsysline.c')
| -rw-r--r-- | runtime/cfsysline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 5df8e64c..5ab73184 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -963,11 +963,11 @@ void dbgPrintCfSysLineHandlers(void) dbgprintf("Sytem Line Configuration Commands:\n"); llCookieCmd = NULL; - while((iRet = llGetNextElt(&llCmdList, &llCookieCmd, (void*)&pCmd)) == RS_RET_OK) { + while(llGetNextElt(&llCmdList, &llCookieCmd, (void*)&pCmd) == RS_RET_OK) { llGetKey(llCookieCmd, (void*) &pKey); /* TODO: using the cookie is NOT clean! */ dbgprintf("\tCommand '%s':\n", pKey); llCookieCmdHdlr = NULL; - while((iRet = llGetNextElt(&pCmd->llCmdHdlrs, &llCookieCmdHdlr, (void*)&pCmdHdlr)) == RS_RET_OK) { + while(llGetNextElt(&pCmd->llCmdHdlrs, &llCookieCmdHdlr, (void*)&pCmdHdlr) == RS_RET_OK) { dbgprintf("\t\ttype : %d\n", pCmdHdlr->eType); dbgprintf("\t\tpData: 0x%lx\n", (unsigned long) pCmdHdlr->pData); dbgprintf("\t\tHdlr : 0x%lx\n", (unsigned long) pCmdHdlr->cslCmdHdlr); |