summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-05 08:59:42 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-05 08:59:42 +0100
commit11420835659758f9ff2f527b3083f5203584a526 (patch)
tree57f433ae7a7616544a163b97688a0e08638c2461 /action.c
parent774f7b7986c7eb84c1d3c7e75ee5f1b03a4f055b (diff)
downloadrsyslog-11420835659758f9ff2f527b3083f5203584a526.tar.gz
rsyslog-11420835659758f9ff2f527b3083f5203584a526.tar.bz2
rsyslog-11420835659758f9ff2f527b3083f5203584a526.zip
refactor: move pbShutdownImmediate to wti_t
Diffstat (limited to 'action.c')
-rw-r--r--action.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/action.c b/action.c
index abd8818e..790ea4ce 100644
--- a/action.c
+++ b/action.c
@@ -1061,7 +1061,7 @@ actionCommit(action_t *pThis, wti_t *pWti, int *pbShutdownImmediate)
/* Commit all active transactions in *DIRECT mode* */
void
-actionCommitAllDirect(wti_t *pWti, int *pbShutdownImmediate)
+actionCommitAllDirect(wti_t *pWti)
{
int i;
action_t *pAction;
@@ -1071,7 +1071,7 @@ actionCommitAllDirect(wti_t *pWti, int *pbShutdownImmediate)
i, getActionStateByNbr(pWti, i), pWti->actWrkrInfo[i].iparamRoot);
pAction = pWti->actWrkrInfo[i].pAction;
if(pAction != NULL && pAction->pQueue->qType == QUEUETYPE_DIRECT)
- actionCommit(pWti->actWrkrInfo[i].pAction, pWti, pbShutdownImmediate);
+ actionCommit(pWti->actWrkrInfo[i].pAction, pWti, pWti->pbShutdownImmediate);
}
}
@@ -1115,7 +1115,7 @@ processBatchMain(void *pVoid, batch_t *pBatch, wti_t *pWti, int *pbShutdownImmed
DEFiRet;
if(pbShutdownImmediate == NULL) {
- pbShutdownImmediate = pBatch->pbShutdownImmediate;
+ pbShutdownImmediate = pWti->pbShutdownImmediate;
}
/* indicate we have not yet read the date */