diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-21 13:27:51 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-21 13:27:51 +0000 |
| commit | 04622f7d2210cbb8036502afadf5bcdcb0394d28 (patch) | |
| tree | 1ba5f0321aaf86f6050193dd8283d85a7f4acd39 /conf.c | |
| parent | 1cc790fae01e4392d4cf96820f6402528f611c44 (diff) | |
| download | rsyslog-04622f7d2210cbb8036502afadf5bcdcb0394d28.tar.gz rsyslog-04622f7d2210cbb8036502afadf5bcdcb0394d28.tar.xz rsyslog-04622f7d2210cbb8036502afadf5bcdcb0394d28.zip | |
first steps in implementing object interfaces (stage work for later dynamic
class loading)
Diffstat (limited to 'conf.c')
| -rw-r--r-- | conf.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -55,6 +55,7 @@ #include "srUtils.h" /* static data */ +DEFobjCurrIf(expr) uchar *pModDir = NULL; /* read-only after startup */ /* The following global variables are used for building @@ -754,11 +755,11 @@ dbgprintf("calling expression parser, pp %p ('%s')\n", *pline, *pline); CHKiRet(ctokConstructFinalize(ctok)); /* now construct our expression */ - CHKiRet(exprConstruct(&f->f_filterData.f_expr)); - CHKiRet(exprConstructFinalize(f->f_filterData.f_expr)); + CHKiRet(expr.Construct(&f->f_filterData.f_expr)); + CHKiRet(expr.ConstructFinalize(f->f_filterData.f_expr)); /* ready to go... */ - CHKiRet(exprParse(f->f_filterData.f_expr, ctok)); + CHKiRet(expr.Parse(f->f_filterData.f_expr, ctok)); /* we now need to parse off the "then" - and note an error if it is * missing... @@ -1148,5 +1149,14 @@ cfline(uchar *line, selector_t **pfCurr) } +/* "mimic" a real object - we are currently not one... */ +rsRetVal confClassInit(void) +{ + DEFiRet; + /* request objects we use */ + CHKiRet(objUse(expr)); +finalize_it: + RETiRet; +} /* vi:set ai: */ |