summaryrefslogtreecommitdiffstats
path: root/grammar
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-24 18:59:26 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-24 18:59:26 +0200
commit8d99cfe38509aeadf169ba63c0d6c841eb2ecbe3 (patch)
treedb53e6673a2f037de931283cec633c13eab1ea33 /grammar
parentbe26632b1e269652992ae6f336c5dd7e2dbec7ab (diff)
downloadrsyslog-8d99cfe38509aeadf169ba63c0d6c841eb2ecbe3.tar.gz
rsyslog-8d99cfe38509aeadf169ba63c0d6c841eb2ecbe3.tar.xz
rsyslog-8d99cfe38509aeadf169ba63c0d6c841eb2ecbe3.zip
Clean up implementation of omdiscard-->STOP optimization
Diffstat (limited to 'grammar')
-rw-r--r--grammar/rainerscript.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index e5154156..ab07e0c4 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -2071,7 +2071,7 @@ cnfstmtOptimizeIf(struct cnfstmt *stmt)
if(stmt->d.s_if.expr->nodetype == 'F') {
func = (struct cnffunc*)expr;
if(func->fID == CNFFUNC_PRIFILT) {
- DBGPRINTF("optimize IF to PRIFILT\n");
+ DBGPRINTF("optimizer: change IF to PRIFILT\n");
t_then = stmt->d.s_if.t_then;
t_else = stmt->d.s_if.t_else;
stmt->nodetype = S_PRIFILT;
@@ -2095,7 +2095,8 @@ cnfstmtOptimizeAct(struct cnfstmt *stmt)
pAct = stmt->d.act;
if(!strcmp((char*)modGetName(stmt->d.act->pMod), "builtin:omdiscard")) {
- DBGPRINTF("RainerScript Optimizer: replacing omdiscard by STOP\n");
+ DBGPRINTF("optimizer: replacing omdiscard by STOP\n");
+ actionDestruct(stmt->d.act);
stmt->nodetype = S_STOP;
}
}