diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 19:18:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 19:18:41 +0200 |
| commit | 8a37736287fd4f7e4fd0c0190aabac11dff19af2 (patch) | |
| tree | bf48f2eeed0fc12cb67103fdeea507f35b6fd9f7 /runtime | |
| parent | c4e18c5bab66537ee9c8fb482edce62c7c39c247 (diff) | |
| download | rsyslog-8a37736287fd4f7e4fd0c0190aabac11dff19af2.tar.gz rsyslog-8a37736287fd4f7e4fd0c0190aabac11dff19af2.tar.xz rsyslog-8a37736287fd4f7e4fd0c0190aabac11dff19af2.zip | |
some cleanup
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/queue.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index dbf59210..46a3a971 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -63,7 +63,7 @@ DEFobjCurrIf(glbl) DEFobjCurrIf(strm) /* forward-definitions */ -rsRetVal qqueueChkPersist(qqueue_t *pThis); +static rsRetVal qqueueChkPersist(qqueue_t *pThis); static rsRetVal qqueueSetEnqOnly(qqueue_t *pThis, int bEnqOnly, int bLockMutex); static rsRetVal qqueueRateLimiter(qqueue_t *pThis); static int qqueueChkStopWrkrDA(qqueue_t *pThis); @@ -1984,10 +1984,8 @@ finalize_it: * abide to our regular call interface)... * rgerhards, 2008-01-13 */ -rsRetVal qqueueChkPersist(qqueue_t *pThis) +static rsRetVal qqueueChkPersist(qqueue_t *pThis) { - DEFiRet; - ISOBJ_TYPE_assert(pThis, qqueue); if(pThis->iPersistUpdCnt && ++pThis->iUpdsSincePersist >= pThis->iPersistUpdCnt) { @@ -1995,7 +1993,7 @@ rsRetVal qqueueChkPersist(qqueue_t *pThis) pThis->iUpdsSincePersist = 0; } - RETiRet; + return RS_RET_OK; } @@ -2301,7 +2299,7 @@ doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, void *pUsr) /* and finally enqueue the message */ CHKiRet(qqueueAdd(pThis, pUsr)); - qqueueChkPersist(pThis); // TODO: optimize, do in outer function! + qqueueChkPersist(pThis); // TODO: optimize, do in outer function! (but we need parts from v5?) finalize_it: RETiRet; |