From 4412b88148a21d54ba1c2f88ba894b6223986b9a Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 29 Feb 2008 09:14:10 +0000 Subject: changed obj base object's calling interface to use the new obj_if_t interface structure --- action.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'action.c') diff --git a/action.c b/action.c index 25821c46..2580c2ac 100644 --- a/action.c +++ b/action.c @@ -41,11 +41,11 @@ #include "cfsysline.h" #include "srUtils.h" - /* forward definitions */ rsRetVal actionCallDoAction(action_t *pAction, msg_t *pMsg); /* object static data (once for all instances) */ +DEFobjStaticHelpers static int glbliActionResumeInterval = 30; int glbliActionResumeRetryCount = 0; /* how often should suspended actions be retried? */ @@ -202,7 +202,7 @@ actionConstructFinalize(action_t *pThis) * spec. -- rgerhards, 2008-01-30 */ CHKiRet(queueConstruct(&pThis->pQueue, ActionQueType, 1, iActionQueueSize, (rsRetVal (*)(void*,void*))actionCallDoAction)); - objSetName((obj_t*) pThis->pQueue, pszQName); + obj.SetName((obj_t*) pThis->pQueue, pszQName); /* ... set some properties ... */ # define setQPROP(func, directive, data) \ @@ -675,6 +675,18 @@ finalize_it: } -/* - * vi:set ai: +/* TODO: we are not yet a real object, the ClassInit here just looks like it is.. + */ +rsRetVal actionClassInit(void) +{ + DEFiRet; + /* request objects we use */ + CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */ + +finalize_it: + RETiRet; +} + + +/* vi:set ai: */ -- cgit