diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 14:27:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 14:27:41 +0200 |
| commit | 5139502b0e20f667fdcccfeebc6a93b1effc407a (patch) | |
| tree | 6255423ab23226e7825069908c2acc45d4245528 /vm.c | |
| parent | 8a28324ed4ee674b6f38ae02a96c3e5db3800b32 (diff) | |
| parent | 3f36ac250f0a0d7b037b79b599694d0c7d13f039 (diff) | |
| download | rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.gz rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.bz2 rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_ng_comparison.html
doc/status.html
msg.c
rsyslog.conf.5
rsyslog.h
rsyslogd.8
syslogd.c
Conflicts were due to patch being multiple times applied in CVS import.
Diffstat (limited to 'vm.c')
| -rw-r--r-- | vm.c | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -193,8 +193,6 @@ CODESTARTop(CMP_CONTAINS) /* operand2 is on top of stack, so needs to be popped first */ vmstk.PopString(pThis->pStk, &operand2); vmstk.PopString(pThis->pStk, &operand1); -var.DebugPrint(operand1); \ -var.DebugPrint(operand2); \ /* TODO: extend cstr class so that it supports location of cstr inside cstr */ bRes = (rsCStrLocateInSzStr(operand2->val.pStr, rsCStrGetSzStr(operand1->val.pStr)) == -1) ? 0 : 1; @@ -233,8 +231,6 @@ CODESTARTop(CMP_STARTSWITH) /* operand2 is on top of stack, so needs to be popped first */ vmstk.PopString(pThis->pStk, &operand2); vmstk.PopString(pThis->pStk, &operand1); -var.DebugPrint(operand1); \ -var.DebugPrint(operand2); \ /* TODO: extend cstr class so that it supports location of cstr inside cstr */ bRes = (rsCStrStartsWithSzStr(operand1->val.pStr, rsCStrGetSzStr(operand2->val.pStr), rsCStrLen(operand2->val.pStr)) == 0) ? 1 : 0; @@ -254,14 +250,11 @@ CODESTARTop(CMP_STARTSWITHI) /* operand2 is on top of stack, so needs to be popped first */ vmstk.PopString(pThis->pStk, &operand2); vmstk.PopString(pThis->pStk, &operand1); -var.DebugPrint(operand1); \ -var.DebugPrint(operand2); \ /* TODO: extend cstr class so that it supports location of cstr inside cstr */ bRes = (rsCStrCaseInsensitveStartsWithSzStr(operand1->val.pStr, rsCStrGetSzStr(operand2->val.pStr), rsCStrLen(operand2->val.pStr)) == 0) ? 1 : 0; /* we have a result, so let's push it */ -RUNLOG_VAR("%lld", bRes); \ PUSHRESULTop(operand1, bRes); var.Destruct(&operand2); /* no longer needed */ ENDop(CMP_STARTSWITHI) |