diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-22 15:32:01 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-22 15:32:01 +0200 |
commit | 5defa14fed704cabe2074f4bdbb6d389d6dee7cf (patch) | |
tree | 5280f5bb9da7329a3a551b417c97bce22ae40fc2 /action.c | |
parent | 651bee9cf55ca6aaea73e7921928bf6f9bd65404 (diff) | |
download | rsyslog-5defa14fed704cabe2074f4bdbb6d389d6dee7cf.tar.gz rsyslog-5defa14fed704cabe2074f4bdbb6d389d6dee7cf.tar.xz rsyslog-5defa14fed704cabe2074f4bdbb6d389d6dee7cf.zip |
some post-merge cleanup
Diffstat (limited to 'action.c')
-rw-r--r-- | action.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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); |