diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-29 16:02:07 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-29 16:02:07 +0000 |
| commit | a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb (patch) | |
| tree | 54449d06aa387064b172423232c0ceb62dc09f90 /conf.c | |
| parent | 20e9b14e39347608d03b41c93349ebe7017b9db9 (diff) | |
| download | rsyslog-a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb.tar.gz rsyslog-a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb.tar.xz rsyslog-a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb.zip | |
- added "debug" command to debug environment settings
- changed the object/interface system to use a new way of calling, giving
up the numerical object ID. This was necessary as we needed more
extensibility for third-party modules (which don't play at all with the
previous fixed object ID). This is stage work for the object loader.
Please note that I needed to change the object (de)serializer, I can't
outrule that I have introduced bugs there.
Diffstat (limited to 'conf.c')
| -rw-r--r-- | conf.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -55,6 +55,7 @@ #include "srUtils.h" /* static data */ +DEFobjCurrIf(obj) DEFobjCurrIf(expr) DEFobjCurrIf(ctok) #include "vm.h" @@ -1174,15 +1175,19 @@ cfline(uchar *line, selector_t **pfCurr) } +/* dummy */ +//static rsRetVal confQueryInterface(void) { return RS_RET_NOT_IMPLEMENTED; } + /* "mimic" a real object - we are currently not one... */ rsRetVal confClassInit(void) { DEFiRet; /* request objects we use */ - CHKiRet(objUse(expr)); - CHKiRet(objUse(ctok)); - CHKiRet(objUse(vm)); // TODO: remove, testing aid! rgerhards, 2008-02-25 - CHKiRet(objUse(var)); // TODO: remove, testing aid! rgerhards, 2008-02-25 + CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */ + CHKiRet(objUse(expr, CORE_COMPONENT)); + CHKiRet(objUse(ctok, CORE_COMPONENT)); + CHKiRet(objUse(vm, CORE_COMPONENT)); // TODO: remove, testing aid! rgerhards, 2008-02-25 + CHKiRet(objUse(var, CORE_COMPONENT)); // TODO: remove, testing aid! rgerhards, 2008-02-25 finalize_it: RETiRet; |