From 9843274dc96ba4b3af079367f9704e232bde2b2d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 29 Jan 2008 14:18:12 +0000 Subject: bugfixing newly added action code --- action.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'action.c') diff --git a/action.c b/action.c index a3684796..eb8f2b02 100644 --- a/action.c +++ b/action.c @@ -84,6 +84,8 @@ rsRetVal actionDestruct(action_t *pThis) { ASSERT(pThis != NULL); + queueDestruct(&pThis->pQueue); + if(pThis->pMod != NULL) pThis->pMod->freeInstance(pThis->pModData); @@ -308,14 +310,16 @@ actionCallDoAction(action_t *pAction, msg_t *pMsg) RUNLOG_STR("going into do_action call loop"); RUNLOG_VAR("%d", iRetries); /* first check if we are suspended and, if so, retry */ + ASSERT(pAction != NULL); if(actionIsSuspended(pAction)) { dbgprintf("action %p is suspended\n", pAction); iRet = actionTryResume(pAction); } if(iRet == RS_RET_OK) { +RUNLOG_STR("calling configured action\n"); /* call configured action */ - iRet = pAction->pMod->mod.om.doAction(pAction->ppMsgs, pAction->f_pMsg->msgFlags, pAction->pModData); + iRet = pAction->pMod->mod.om.doAction(pAction->ppMsgs, pMsg->msgFlags, pAction->pModData); } RUNLOG_VAR("%d", iRet); -- cgit