diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-20 12:18:20 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-20 12:18:20 +0200 |
| commit | bf8125f4e96a011ec28cc58b225bb815f72fc53c (patch) | |
| tree | 2431ecfe08b01c7ef1756cc8e2b5be9fd4a65c60 /runtime/wti.c | |
| parent | 4ec7b9d9ec12d91dde3d030bdaf87cfdd6b5d81d (diff) | |
| download | rsyslog-bf8125f4e96a011ec28cc58b225bb815f72fc53c.tar.gz rsyslog-bf8125f4e96a011ec28cc58b225bb815f72fc53c.tar.bz2 rsyslog-bf8125f4e96a011ec28cc58b225bb815f72fc53c.zip | |
bugfix: minor static memory leak while reading configuration
This did NOT leak based on message volume. Also, did some cleanup during
the commit.
Diffstat (limited to 'runtime/wti.c')
| -rw-r--r-- | runtime/wti.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/runtime/wti.c b/runtime/wti.c index 91c63ffe..900e1cba 100644 --- a/runtime/wti.c +++ b/runtime/wti.c @@ -192,7 +192,7 @@ wtiWorkerCancelCleanup(void *arg) DBGPRINTF("%s: cancelation cleanup handler called.\n", wtiGetDbgHdr(pThis)); - /* call user supplied handler (that one e.g. requeues the element) */ + /* call user supplied handler */ pWtp->pfOnWorkerCancel(pThis->pWtp->pUsr, pThis->batch.pElem[0].pUsrp); ENDfunc @@ -215,7 +215,6 @@ doIdleProcessing(wti_t *pThis, wtp_t *pWtp, int *pbInactivityTOOccured) pWtp->pfOnIdle(pWtp->pUsr, MUTEX_ALREADY_LOCKED); d_pthread_mutex_lock(pWtp->pmutUsr); -RUNLOG_VAR("%d", pThis->bAlwaysRunning); if(pThis->bAlwaysRunning) { /* never shut down any started worker */ d_pthread_cond_wait(pWtp->pcondBusy, pWtp->pmutUsr); @@ -321,7 +320,6 @@ wtiSetDbgHdr(wti_t *pThis, uchar *pszMsg, size_t lenMsg) if(pThis->pszDbgHdr != NULL) { free(pThis->pszDbgHdr); - pThis->pszDbgHdr = NULL; } if((pThis->pszDbgHdr = malloc(sizeof(uchar) * lenMsg + 1)) == NULL) @@ -355,6 +353,5 @@ BEGINObjClassInit(wti, 1, OBJ_IS_CORE_MODULE) /* one is the object version (most CHKiRet(objUse(glbl, CORE_COMPONENT)); ENDObjClassInit(wti) -/* - * vi:set ai: +/* vi:set ai: */ |