diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-24 14:44:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-24 14:44:45 +0200 |
| commit | bf1eef67ddfe16682d2733713ec0b2a3301840b9 (patch) | |
| tree | 51b9008a6a38e689c9f29a6b516435d216ba1c16 | |
| parent | c72a43d280744b2b1fec5e981651fc9bc8035f94 (diff) | |
| download | rsyslog-bf1eef67ddfe16682d2733713ec0b2a3301840b9.tar.gz rsyslog-bf1eef67ddfe16682d2733713ec0b2a3301840b9.tar.bz2 rsyslog-bf1eef67ddfe16682d2733713ec0b2a3301840b9.zip | |
cleanup
| -rw-r--r-- | grammar/rainerscript.c | 2 | ||||
| -rw-r--r-- | runtime/ruleset.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 9483e116..733ebef4 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2458,7 +2458,7 @@ cnfstmtOptimizeAct(struct cnfstmt *stmt) action_t *pAct; pAct = stmt->d.act; - if(!strcmp((char*)modGetName(stmt->d.act->pMod), "builtin:omdiscard")) { + if(!strcmp((char*)modGetName(pAct->pMod), "builtin:omdiscard")) { DBGPRINTF("optimizer: replacing omdiscard by STOP\n"); actionDestruct(stmt->d.act); stmt->nodetype = S_STOP; diff --git a/runtime/ruleset.c b/runtime/ruleset.c index bdeb61b7..8d2bb924 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -458,14 +458,12 @@ static void execPROPFILT(struct cnfstmt *stmt, batch_t *pBatch, sbool *active) { sbool *thenAct; - msg_t *pMsg; sbool bRet; int i; thenAct = newActive(pBatch); for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) { if(pBatch->pElem[i].state == BATCH_STATE_DISC) continue; /* will be ignored in any case */ - pMsg = (msg_t*)(pBatch->pElem[i].pUsrp); if(active == NULL || active[i]) { bRet = evalPROPFILT(stmt, (msg_t*)(pBatch->pElem[i].pUsrp)); } else |