diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 10:27:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 10:27:07 +0200 |
| commit | d82327c9547c6fb2dcd6d1820c81e4da72c9531b (patch) | |
| tree | 9599354000bf2570dccd0b22e5f6590fab3581ab | |
| parent | b1635a867e6c32886c1c14616e79f36de2be988a (diff) | |
| download | rsyslog-d82327c9547c6fb2dcd6d1820c81e4da72c9531b.tar.gz rsyslog-d82327c9547c6fb2dcd6d1820c81e4da72c9531b.tar.bz2 rsyslog-d82327c9547c6fb2dcd6d1820c81e4da72c9531b.zip | |
re-enable deprecated warings for omdiscard/omruleset
merge for action list functionality will follow soon
| -rw-r--r-- | plugins/omruleset/omruleset.c | 4 | ||||
| -rw-r--r-- | tools/omdiscard.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c index d1d6eb00..6c770c94 100644 --- a/plugins/omruleset/omruleset.c +++ b/plugins/omruleset/omruleset.c @@ -165,12 +165,8 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omruleset:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); - /* re-enable in v7.3: requires action list to support - * action-like statements, something that is too late to - * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider " "using the 'call' statement instead"); - */ /* check if a non-standard template is to be applied */ if(*(p-1) == ';') diff --git a/tools/omdiscard.c b/tools/omdiscard.c index 08cd7491..15c6ea82 100644 --- a/tools/omdiscard.c +++ b/tools/omdiscard.c @@ -95,13 +95,9 @@ CODE_STD_STRING_REQUESTparseSelectorAct(0) if(*p == '~') { dbgprintf("discard\n"); - /* re-enable in v7.3: requires action list to support - * action-like statements, something that is too late to - * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: ~ action " "is deprecated, consider using the 'stop' " "statement instead"); - */ } else { iRet = RS_RET_CONFLINE_UNPROCESSED; } |