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/cfsysline.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/cfsysline.c')
-rw-r--r-- | runtime/cfsysline.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 5df8e64c..037e9f84 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -953,8 +953,6 @@ finalize_it: */ void dbgPrintCfSysLineHandlers(void) { - DEFiRet; - cslCmd_t *pCmd; cslCmdHdlr_t *pCmdHdlr; linkedListCookie_t llCookieCmd; @@ -963,11 +961,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); @@ -976,7 +974,6 @@ void dbgPrintCfSysLineHandlers(void) } } dbgprintf("\n"); - ENDfunc } |