summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-29 09:14:10 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-29 09:14:10 +0000
commit4412b88148a21d54ba1c2f88ba894b6223986b9a (patch)
tree07c18ea553bf5060d2ca1b431164d5a36b725d73 /syslogd.c
parent3d0f49a82e46fdffd8bb2c653ccb46ddd516e112 (diff)
downloadrsyslog-4412b88148a21d54ba1c2f88ba894b6223986b9a.tar.gz
rsyslog-4412b88148a21d54ba1c2f88ba894b6223986b9a.tar.xz
rsyslog-4412b88148a21d54ba1c2f88ba894b6223986b9a.zip
changed obj base object's calling interface to use the new obj_if_t
interface structure
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/syslogd.c b/syslogd.c
index 506f90a8..2f7ba0f2 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -178,6 +178,7 @@
#include "sysvar.h"
/* definitions for objects we access */
+DEFobjCurrIf(obj)
DEFobjCurrIf(expr)
DEFobjCurrIf(vm)
@@ -2900,7 +2901,7 @@ init(void)
exit(1);
}
/* name our main queue object (it's not fatal if it fails...) */
- objSetName((obj_t*) pMsgQueue, (uchar*) "main queue");
+ obj.SetName((obj_t*) pMsgQueue, (uchar*) "main queue");
/* ... set some properties ... */
# define setQPROP(func, directive, data) \
@@ -3577,6 +3578,7 @@ static rsRetVal InitGlobalClasses(void)
CHKiRet(objClassInit()); /* *THIS* *MUST* always be the first class initilizer being called! */
/* dummy "classes" */
CHKiRet(confClassInit());
+ CHKiRet(actionClassInit());
/* real ones */
CHKiRet(msgClassInit());
@@ -3595,6 +3597,7 @@ static rsRetVal InitGlobalClasses(void)
CHKiRet(exprClassInit());
/* request objects we use */
+ CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */
CHKiRet(objUse(expr));
CHKiRet(objUse(vm));