summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/syslogd.c6
-rw-r--r--tools/syslogd.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index c7f36b45..d5429855 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -429,11 +429,11 @@ 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);
- if(pThis->regex_cache != NULL)
- rsRegexDestruct(&pThis->regex_cache);
}
llDestroy(&pThis->llActList);
@@ -1080,7 +1080,7 @@ static rsRetVal shouldProcessThisMessage(selector_t *f, msg_t *pMsg, int *bProce
//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->regex_cache) == 0)
+ (unsigned char*) pszPropVal, &f->f_filterData.prop.regex_cache) == 0)
bRet = 1;
break;
case FIOP_EREREGEX:
diff --git a/tools/syslogd.h b/tools/syslogd.h
index ecaaec34..8b9bd131 100644
--- a/tools/syslogd.h
+++ b/tools/syslogd.h
@@ -73,6 +73,7 @@ struct filed {
FIOP_REGEX = 4, /* matches a (BRE) regular expression? */
FIOP_EREREGEX = 5 /* matches a ERE regular expression? */
} operation;
+ regex_t *regex_cache; /* cache for compiled REs, if such are used */
cstr_t *pCSCompValue; /* value to "compare" against */
char isNegated; /* actually a boolean ;) */
} prop;
@@ -80,7 +81,6 @@ struct filed {
} f_filterData;
linkedList_t llActList; /* list of configured actions */
-regex_t *regex_cache;
};