summaryrefslogtreecommitdiffstats
path: root/runtime/conf.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-16 17:28:29 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-16 17:28:29 +0200
commit4beff8dab6ff3d0cb2e386ca6c4b468371bef05a (patch)
treea2179a9847a555d05d31e3614377e9f5b6ca1857 /runtime/conf.c
parent2d5e8ba7cd05a95f897506e51dcc5adb06dbcaa8 (diff)
parentf07d74a87f91b6fe2f5091ec2547b7886ab3a23e (diff)
downloadrsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.gz
rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.bz2
rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.zip
Merge branch 'nextmaster' into oracle
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'runtime/conf.c')
-rw-r--r--runtime/conf.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c
index ede15cc7..27ab8bb4 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -796,7 +796,6 @@ dbgprintf("calling expression parser, pp %p ('%s')\n", *pline, *pline);
/* debug support - print vmprg after construction (uncomment to use) */
/* vmprgDebugPrint(f->f_filterData.f_expr->pVmprg); */
- vmprgDebugPrint(f->f_filterData.f_expr->pVmprg);
/* we now need to skip whitespace to the action part, else we confuse
* the legacy rsyslog conf parser. -- rgerhards, 2008-02-25