diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 17:28:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 17:28:29 +0200 |
| commit | 4beff8dab6ff3d0cb2e386ca6c4b468371bef05a (patch) | |
| tree | a2179a9847a555d05d31e3614377e9f5b6ca1857 /runtime | |
| parent | 2d5e8ba7cd05a95f897506e51dcc5adb06dbcaa8 (diff) | |
| parent | f07d74a87f91b6fe2f5091ec2547b7886ab3a23e (diff) | |
| download | rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.gz rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.xz rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.zip | |
Merge branch 'nextmaster' into oracle
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 1 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 4 |
2 files changed, 4 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 diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 8e181b9e..026fbbed 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -262,6 +262,10 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_INVLD_FUNC = -2113, /**< invalid function name for function call (rainerscript) */ RS_RET_DUP_FUNC_NAME = -2114, /**< duplicate function name (rainerscript) */ RS_RET_UNKNW_FUNC = -2115, /**< unkown function name (rainerscript) */ + RS_RET_ERR_RLIM_NOFILE = -2116, /**< error setting max. nbr open files process limit */ + RS_RET_ERR_CREAT_PIPE = -2117, /**< error during pipe creation */ + RS_RET_ERR_FORK = -2118, /**< error during fork() */ + RS_RET_ERR_WRITE_PIPE = -2119, /**< error writing to pipe */ RS_RET_RSCORE_TOO_OLD = -2120, /**< rsyslog core is too old for ... (eg this plugin) */ /* RainerScript error messages (range 1000.. 1999) */ |