diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:22:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:22:19 +0200 |
| commit | a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc (patch) | |
| tree | 7c1948376b317d01651fe2c86e44ae822523c2a1 /action.c | |
| parent | 8d471ab9450d653dd40187f0476365cce0d3ce4f (diff) | |
| parent | 3ebbb9c4bbfe5d4a815861afde28df47d35b022e (diff) | |
| download | rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.tar.gz rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.tar.xz rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -967,7 +967,7 @@ tryDoAction(action_t *pAction, batch_t *pBatch, int *pnElem) i = pBatch->iDoneUpTo; /* all messages below that index are processed */ iElemProcessed = 0; iCommittedUpTo = i; -dbgprintf("XXXXX: tryDoAction %p, pnElem %d, nElem %d\n", pAction, *pnElem, pBatch->nElem); + DBGPRINTF("tryDoAction %p, pnElem %d, nElem %d\n", pAction, *pnElem, pBatch->nElem); while(iElemProcessed <= *pnElem && i < pBatch->nElem) { if(*(pBatch->pbShutdownImmediate)) ABORT_FINALIZE(RS_RET_FORCE_TERM); |