diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 17:56:10 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 17:56:10 +0200 |
commit | d747083e54badeeb45f3d46df2916047e60021b4 (patch) | |
tree | 2a2de62ce368f6e4d7db01b85039728ad032c78e /tools/syslogd.c | |
parent | 8de35eaa2c9017df885dfd071a89288ca6a0e3af (diff) | |
parent | 4ab540e3ba25a13fd079490ac52438e55dc92672 (diff) | |
download | rsyslog-d747083e54badeeb45f3d46df2916047e60021b4.tar.gz rsyslog-d747083e54badeeb45f3d46df2916047e60021b4.tar.xz rsyslog-d747083e54badeeb45f3d46df2916047e60021b4.zip |
Merge branch 'regex'
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r-- | tools/syslogd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 16f255ea..b23c12a7 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -429,6 +429,8 @@ selectorDestruct(void *pVal) rsCStrDestruct(&pThis->f_filterData.prop.pCSPropName); if(pThis->f_filterData.prop.pCSCompValue != NULL) rsCStrDestruct(&pThis->f_filterData.prop.pCSCompValue); + if(pThis->f_filterData.prop.regex_cache != NULL) + rsCStrRegexDestruct(&pThis->f_filterData.prop.regex_cache); } else if(pThis->f_filter_type == FILTER_EXPR) { if(pThis->f_filterData.f_expr != NULL) expr.Destruct(&pThis->f_filterData.f_expr); @@ -1076,12 +1078,12 @@ static rsRetVal shouldProcessThisMessage(selector_t *f, msg_t *pMsg, int *bProce break; case FIOP_REGEX: if(rsCStrSzStrMatchRegex(f->f_filterData.prop.pCSCompValue, - (unsigned char*) pszPropVal, 0) == RS_RET_OK) + (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: |