diff options
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 34 |
1 files changed, 1 insertions, 33 deletions
@@ -327,10 +327,6 @@ rsRetVal actionConstruct(action_t **ppThis) ASSERT(ppThis != NULL); - if(cs.pszActionName != NULL) { - free(cs.pszActionName); - cs.pszActionName = NULL; - } CHKmalloc(pThis = (action_t*) calloc(1, sizeof(action_t))); pThis->iResumeInterval = 30; pThis->iResumeRetryCount = 0; @@ -1351,7 +1347,7 @@ doSubmitToActionQ(action_t *pAction, msg_t *pMsg) if(pAction->pQueue->qType == QUEUETYPE_DIRECT) iRet = qqueueEnqObjDirect(pAction->pQueue, (void*) MsgAddRef(pMsg)); else - iRet = qqueueEnqObj(pAction->pQueue, pMsg->flowCtlType, (void*) MsgAddRef(pMsg)); + iRet = qqueueEnqObj(pAction->pQueue, eFLOWCTL_NO_DELAY, (void*) MsgAddRef(pMsg)); RETiRet; } @@ -2015,34 +2011,6 @@ initConfigVariables(void) } -/* save our config and create a new scope. Note that things are messed up if - * this is called while the config is already saved (we currently do not - * have a stack as the design is we need none! - * rgerhards, 2010-07-23 - */ -rsRetVal -actionNewScope(void) -{ - DEFiRet; - memcpy(&cs_save, &cs, sizeof(cs)); - initConfigVariables(); - RETiRet; -} - - -/* restore previously saved scope. - * rgerhards, 2010-07-23 - */ -rsRetVal -actionRestoreScope(void) -{ - DEFiRet; - memcpy(&cs, &cs_save, sizeof(cs)); - RETiRet; -} - - - rsRetVal actionNewInst(struct nvlst *lst, action_t **ppAction) { |