some post-merge cleanup

2 files changed, 2 insertions, 7 deletions

diff --git a/action.c b/action.c
index 8c41b638..5d591a5d 100644
--- a/action.c
+++ b/action.c
@@ -608,9 +608,8 @@ rsRetVal actionDbgPrint(action_t *pThis)
 /* prepare the calling parameters for doAction()
  * rgerhards, 2009-05-07
  */
-static rsRetVal prepareDoActionParams(action_t *pAction, msg_t *pMsg, uchar ***pppMsgs)
+static rsRetVal prepareDoActionParams(action_t *pAction, msg_t *pMsg)
 {
-	uchar **ppMsgs = *pppMsgs;
 	int i;
 	DEFiRet;
 
@@ -630,7 +629,6 @@ static rsRetVal prepareDoActionParams(action_t *pAction, msg_t *pMsg, uchar ***p
 	}
 
 finalize_it:
-	*pppMsgs = ppMsgs;
 	RETiRet;
 }
 
@@ -683,14 +681,13 @@ static rsRetVal cleanupDoActionParams(action_t *pAction)
 rsRetVal
 actionCallDoAction(action_t *pThis, msg_t *pMsg)
 {
-	uchar **ppMsgs;		/* array of message pointers for doAction */
 	DEFiRet;
 
 	ASSERT(pThis != NULL);
 	ISOBJ_TYPE_assert(pMsg, msg);
 
 	DBGPRINTF("entering actionCalldoAction(), state: %s\n", getActStateName(pThis));
-	CHKiRet(prepareDoActionParams(pThis, pMsg, &ppMsgs));
+	CHKiRet(prepareDoActionParams(pThis, pMsg));
 
 	pThis->bHadAutoCommit = 0;
 	iRet = pThis->pMod->mod.om.doAction(pThis->ppMsgs, pMsg->msgFlags, pThis->pModData);
diff --git a/action.h b/action.h
index 6155ee36..a29936e5 100644
--- a/action.h
+++ b/action.h
@@ -56,8 +56,6 @@ struct action_s {
 	int	iSecsExecOnceInterval; /* if non-zero, minimum seconds to wait until action is executed again */
 	action_state_t eState;	/* current state of action */
 	int	bHadAutoCommit;	/* did an auto-commit happen during doAction()? */
-	//short	bEnabled;	/* is the related action enabled (1) or disabled (0)? */
-	//short	bSuspended;	/* is the related action temporarily suspended? */
 	time_t	ttResumeRtry;	/* when is it time to retry the resume? */
 	int	iResumeInterval;/* resume interval for this action */
 	int	iResumeRetryCount;/* how often shall we retry a suspended action? (-1 --> eternal) */