diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
| commit | 85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1 (patch) | |
| tree | d36a73e60aa9dc497dc218c64d74d53268139fe3 /runtime | |
| parent | 01e5d51c57536acfa8e05d5b22c001a6cf0701d8 (diff) | |
| parent | 01f2c7a7a3ee394028eb36d9709490cbc26c7369 (diff) | |
| download | rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.gz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.xz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.zip | |
Merge branch 'omprog' into nextmaster
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 1 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 3 |
2 files changed, 3 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 25ec30fc..8e376291 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -263,6 +263,9 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth 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 */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |