summaryrefslogtreecommitdiffstats
path: root/runtime/conf.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-14 14:49:01 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-14 14:49:01 +0200
commit85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1 (patch)
treed36a73e60aa9dc497dc218c64d74d53268139fe3 /runtime/conf.c
parent01e5d51c57536acfa8e05d5b22c001a6cf0701d8 (diff)
parent01f2c7a7a3ee394028eb36d9709490cbc26c7369 (diff)
downloadrsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.gz
rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.xz
rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.zip
Merge branch 'omprog' into nextmaster
Conflicts: ChangeLog 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