diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 17:54:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 17:54:48 +0200 |
| commit | 4ab540e3ba25a13fd079490ac52438e55dc92672 (patch) | |
| tree | 14586687d81fa45ecadfebb54e3e05b0e8b43716 /tools | |
| parent | 1d16216aa326296673cc8520a8df351c4d492dfe (diff) | |
| download | rsyslog-4ab540e3ba25a13fd079490ac52438e55dc92672.tar.gz rsyslog-4ab540e3ba25a13fd079490ac52438e55dc92672.tar.xz rsyslog-4ab540e3ba25a13fd079490ac52438e55dc92672.zip | |
fully integrated regex patch
Now have removed the previous method, as really nobody should call
it any longer (and now nobody does ;)). Also did some other cleanup.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index d5429855..b23c12a7 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1077,15 +1077,13 @@ static rsRetVal shouldProcessThisMessage(selector_t *f, msg_t *pMsg, int *bProce bRet = 1; /* process message! */ break; case FIOP_REGEX: - //TODO REGEX: this needs to be merged with new functionality below - //rgerhards, 2009-04-02 - if(rsCStrSzStrMatchRegexCache(f->f_filterData.prop.pCSCompValue, - (unsigned char*) pszPropVal, &f->f_filterData.prop.regex_cache) == 0) + if(rsCStrSzStrMatchRegex(f->f_filterData.prop.pCSCompValue, + (unsigned char*) pszPropVal, 0, &f->f_filterData.prop.regex_cache) == RS_RET_OK) bRet = 1; break; case FIOP_EREREGEX: if(rsCStrSzStrMatchRegex(f->f_filterData.prop.pCSCompValue, - (unsigned char*) pszPropVal, 1) == RS_RET_OK) + (unsigned char*) pszPropVal, 1, &f->f_filterData.prop.regex_cache) == RS_RET_OK) bRet = 1; break; default: |