diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 14:53:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 14:53:22 +0200 |
| commit | 359ddad3c5dce82ab48964c1d8b804c4155ea39c (patch) | |
| tree | 8e93dffd3eff113cc05537d9699d5065dcb06ee4 /action.c | |
| parent | 26a668f8fa352e63aefcc762eadd123002b3895d (diff) | |
| parent | 943a2070a6f556c48a903d55da0317b5942a41b6 (diff) | |
| download | rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.gz rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.xz rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -819,7 +819,7 @@ finalize_it: */ static rsRetVal releaseBatch(action_t *pAction, batch_t *pBatch) { - int iArr; + int jArr; int i, j; batch_obj_t *pElem; uchar ***ppMsgs; @@ -833,15 +833,15 @@ static rsRetVal releaseBatch(action_t *pAction, batch_t *pBatch) switch(pAction->eParamPassing) { case ACT_ARRAY_PASSING: ppMsgs = (uchar***) pElem->staticActParams; - for(i = 0 ; i < pAction->iNumTpls ; ++i) { - if(((uchar**)ppMsgs)[i] != NULL) { - iArr = 0; - while(ppMsgs[i][iArr] != NULL) { - d_free(ppMsgs[i][iArr++]); - ppMsgs[i][iArr++] = NULL; + for(j = 0 ; j < pAction->iNumTpls ; ++j) { + if(((uchar**)ppMsgs)[j] != NULL) { + jArr = 0; + while(ppMsgs[j][jArr] != NULL) { + d_free(ppMsgs[j][jArr++]); + ppMsgs[j][jArr++] = NULL; } - d_free(((uchar**)ppMsgs)[i]); - ((uchar**)ppMsgs)[i] = NULL; + d_free(((uchar**)ppMsgs)[j]); + ((uchar**)ppMsgs)[j] = NULL; } } break; @@ -1415,7 +1415,6 @@ actionWriteToAction(action_t *pAction) DBGPRINTF("action not yet ready again to be executed, onceInterval %d, tCurr %d, tNext %d\n", (int) pAction->iSecsExecOnceInterval, (int) getActNow(pAction), (int) (pAction->iSecsExecOnceInterval + pAction->tLastExec)); - pAction->tLastExec = getActNow(pAction); /* re-init time flags */ FINALIZE; } |