diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 17:45:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 17:45:21 +0200 |
| commit | 809f0a16e75bf7679a4919c642699a7bb3039ae3 (patch) | |
| tree | 5669c84e04fe8e6a605d11b9d50634ff8ce9c266 /runtime/rule.c | |
| parent | cafb951020817cca6b89b5cc6b91f3a8ab86f29a (diff) | |
| parent | 4130ca8670b37d0fe92a1abb47a2840c62604ded (diff) | |
| download | rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.tar.gz rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.tar.bz2 rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.zip | |
Merge branch 'master' into udpspoof & cleanup & slight optimization
Conflicts:
runtime/msg.c
I messed up and did some changes during the merge commit ;) But these are
not large, just a little bit of cleanup and some very slight optimizations
inside the msg object.
Diffstat (limited to 'runtime/rule.c')
| -rw-r--r-- | runtime/rule.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/rule.c b/runtime/rule.c index 3a257a90..182d616a 100644 --- a/runtime/rule.c +++ b/runtime/rule.c @@ -39,6 +39,7 @@ #include "vm.h" #include "var.h" #include "srUtils.h" +#include "unicode-helper.h" #include "dirty.h" /* for getFIOPName */ /* static data */ @@ -104,7 +105,7 @@ shouldProcessThisMessage(rule_t *pRule, msg_t *pMsg, int *bProcessMsg) { DEFiRet; unsigned short pbMustBeFreed; - char *pszPropVal; + uchar *pszPropVal; int bRet = 0; size_t propLen; vm_t *pVM = NULL; @@ -189,12 +190,12 @@ shouldProcessThisMessage(rule_t *pRule, msg_t *pMsg, int *bProcessMsg) break; case FIOP_ISEQUAL: if(rsCStrSzStrCmp(pRule->f_filterData.prop.pCSCompValue, - (uchar*) pszPropVal, strlen(pszPropVal)) == 0) + pszPropVal, ustrlen(pszPropVal)) == 0) bRet = 1; /* process message! */ break; case FIOP_STARTSWITH: if(rsCStrSzStrStartsWithCStr(pRule->f_filterData.prop.pCSCompValue, - (uchar*) pszPropVal, strlen(pszPropVal)) == 0) + pszPropVal, ustrlen(pszPropVal)) == 0) bRet = 1; /* process message! */ break; case FIOP_REGEX: |