diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:38:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:38:09 +0200 |
| commit | 7bebfd3b60894bd913e3d6cbcad5447a607e0a0b (patch) | |
| tree | 4243c632639de11ccb08eebd014851f1bc3f6711 /grammar/rainerscript.c | |
| parent | 156382746626459aaf64d79eac95183d1ab60680 (diff) | |
| parent | 2ae9e456db8991e61b4aa48cf9b74f6d20689ce4 (diff) | |
| download | rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.gz rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.bz2 rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'grammar/rainerscript.c')
| -rw-r--r-- | grammar/rainerscript.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index ad6a32e8..9483e116 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2186,10 +2186,14 @@ cnfstmtNewAct(struct nvlst *lst) { struct cnfstmt* cnfstmt; char namebuf[256]; + rsRetVal localRet; if((cnfstmt = cnfstmtNew(S_ACT)) == NULL) goto done; - if(actionNewInst(lst, &cnfstmt->d.act) != RS_RET_OK) { - // TODO:RS_RET_WARN? + localRet = actionNewInst(lst, &cnfstmt->d.act); + if(localRet == RS_RET_OK_WARN) { + parser_errmsg("warnings occured in file '%s' around line %d", + cnfcurrfn, yylineno); + } else if(localRet != RS_RET_OK) { parser_errmsg("errors occured in file '%s' around line %d", cnfcurrfn, yylineno); cnfstmt->nodetype = S_NOP; /* disable action! */ @@ -2199,6 +2203,8 @@ cnfstmtNewAct(struct nvlst *lst) modGetName(cnfstmt->d.act->pMod)); namebuf[255] = '\0'; /* be on safe side */ cnfstmt->printable = (uchar*)strdup(namebuf); + nvlstChkUnused(lst); + nvlstDestruct(lst); done: return cnfstmt; } |