diff options
author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:46:33 +0200 |
---|---|---|
committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:46:33 +0200 |
commit | e14d353e69a75290c3e4004df79f42a22bfe4cab (patch) | |
tree | 7d74717632ca25ea585aa30df87d43c1e2f4af3d /runtime/queue.c | |
parent | 179a27d80d6c13625d5f9cee9b15acbd5fb33651 (diff) | |
parent | c1108d7af1ca04b2c485bd87a8cbbf044ffde6fb (diff) | |
download | rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.tar.gz rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.tar.xz rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.zip |
Merge branch 'beta'
Conflicts:
runtime/queue.c
Diffstat (limited to 'runtime/queue.c')
-rw-r--r-- | runtime/queue.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index f390d987..3876ec39 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -93,7 +93,6 @@ static rsRetVal qDestructDisk(qqueue_t *pThis); #define QUEUE_CHECKPOINT 1 #define QUEUE_NO_CHECKPOINT 0 - /* tables for interfacing with the v6 config system */ static struct cnfparamdescr cnfpdescr[] = { { "queue.filename", eCmdHdlrGetWord, 0 }, @@ -127,6 +126,14 @@ static struct cnfparamblk pblk = cnfpdescr }; +/* debug aid */ +static void displayBatchState(batch_t *pBatch) +{ + int i; + for(i = 0 ; i < pBatch->nElem ; ++i) { + dbgprintf("XXXXX: displayBatchState %p[%d]: %d\n", pBatch, i, pBatch->pElem[i].state); + } +} /*********************************************************************** * we need a private data structure, the "to-delete" list. As C does |