summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-28 16:01:36 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-28 16:01:36 +0000
commitad0f35124a5bd44628e2fc1a70166fedb24482e8 (patch)
tree6b1001481ce8b15b9716d3dbd65820fdb8114ee4
parent0621b1339d7b308a89356a9201eba4562a58085d (diff)
downloadrsyslog-ad0f35124a5bd44628e2fc1a70166fedb24482e8.tar.gz
rsyslog-ad0f35124a5bd44628e2fc1a70166fedb24482e8.tar.xz
rsyslog-ad0f35124a5bd44628e2fc1a70166fedb24482e8.zip
bugfix: removed debugging code that I forgot to remove before releasing
3.12.0 (does not cause harm and happened only during startup)
-rw-r--r--ChangeLog4
-rw-r--r--conf.c17
2 files changed, 4 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index fd126243..29f0decc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+Version 3.12.1 (rgerhards), 2008-0?-??
+- bugfix: removed debugging code that I forgot to remove before releasing
+ 3.12.0 (does not cause harm and happened only during startup)
+---------------------------------------------------------------------------
Version 3.12.0 (rgerhards), 2008-02-28
- added full expression support for filters; filters can now contain
arbitrary complex boolean, string and arithmetic expressions
diff --git a/conf.c b/conf.c
index d2d1fbcf..1229f1c4 100644
--- a/conf.c
+++ b/conf.c
@@ -799,23 +799,6 @@ dbgprintf("calling expression parser, pp %p ('%s')\n", *pline, *pline);
while(isspace(**pline))
++(*pline);
-dbgprintf("expression parser successfully ended, pp %p ('%s')\n", *pline, *pline);
-
-/* debug aid, try to exec - just now for testing the vm... -- rgerhards, 2008-02-25 */
-vm_t *pVM;
-var_t *pResult;
-CHKiRet(vm.Construct(&pVM));
-CHKiRet(vm.ConstructFinalize(pVM));
-
-CHKiRet(vm.ExecProg(pVM, f->f_filterData.f_expr->pVmprg));
-CHKiRet(vm.PopVarFromStack(pVM, &pResult));
-dbgprintf("result of expression run:\n");
-var.DebugPrint(pResult);
-
-CHKiRet(vm.Destruct(&pVM));
-/* ...end testing aid... */
-
-
finalize_it:
RUNLOG_VAR("%d", iRet);
if(iRet == RS_RET_SYNTAX_ERROR) {