diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:59:52 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:59:52 +0200 |
commit | 3f36ac250f0a0d7b037b79b599694d0c7d13f039 (patch) | |
tree | 70ab236affb14e606284f6bd97f1e2aec4e46d09 | |
parent | 2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7 (diff) | |
parent | ade79c4df054e56905694013f2e60ad0bb3c8647 (diff) | |
download | rsyslog-3f36ac250f0a0d7b037b79b599694d0c7d13f039.tar.gz rsyslog-3f36ac250f0a0d7b037b79b599694d0c7d13f039.tar.xz rsyslog-3f36ac250f0a0d7b037b79b599694d0c7d13f039.zip |
Merge branch 'v3-stable' into beta
-rw-r--r-- | expr.c | 3 | ||||
-rw-r--r-- | vm.c | 7 |
2 files changed, 0 insertions, 10 deletions
@@ -371,7 +371,6 @@ exprParse(expr_t *pThis, ctok_t *tok) /* happy parsing... */ CHKiRet(expr(pThis, tok)); dbgoprint((obj_t*) pThis, "successfully parsed/created expression\n"); -vmprg.DebugPrint(pThis->pVmprg); finalize_it: RETiRet; @@ -392,8 +391,6 @@ CODESTARTobjQueryInterface(expr) * work here (if we can support an older interface version - that, * of course, also affects the "if" above). */ - //xxxpIf->oID = OBJexpr; - pIf->Construct = exprConstruct; pIf->ConstructFinalize = exprConstructFinalize; pIf->Destruct = exprDestruct; @@ -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) |