summaryrefslogtreecommitdiffstats
path: root/ctok.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-29 16:02:07 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-29 16:02:07 +0000
commita7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb (patch)
tree54449d06aa387064b172423232c0ceb62dc09f90 /ctok.c
parent20e9b14e39347608d03b41c93349ebe7017b9db9 (diff)
downloadrsyslog-a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb.zip
rsyslog-a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb.tar.gz
rsyslog-a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb.tar.xz
- 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 'ctok.c')
-rw-r--r--ctok.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ctok.c b/ctok.c
index 867a448..aaffed3 100644
--- a/ctok.c
+++ b/ctok.c
@@ -573,7 +573,7 @@ CODESTARTobjQueryInterface(ctok)
* work here (if we can support an older interface version - that,
* of course, also affects the "if" above).
*/
- pIf->oID = OBJctok;
+ //xxxpIf->oID = OBJctok;
pIf->Construct = ctokConstruct;
pIf->ConstructFinalize = ctokConstructFinalize;
@@ -589,8 +589,8 @@ ENDobjQueryInterface(ctok)
BEGINObjClassInit(ctok, 1, OBJ_IS_CORE_MODULE) /* class, version */
/* request objects we use */
- CHKiRet(objUse(ctok_token));
- CHKiRet(objUse(var));
+ CHKiRet(objUse(ctok_token, CORE_COMPONENT));
+ CHKiRet(objUse(var, CORE_COMPONENT));
OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, ctokConstructFinalize);
ENDObjClassInit(ctok)