moved message destruction back to consumer - the consume should decide what

    to do with the object. It may pass it on to someone else. So this would
    have creatd some headache in the future (maybe...).

3 files changed, 1 insertions, 13 deletions

diff --git a/msg.c b/msg.c
index f6e015ac..8c02ed18 100644
--- a/msg.c
+++ b/msg.c
@@ -135,11 +135,9 @@ msg_t* MsgConstruct(void)
 rsRetVal MsgDestruct(msg_t * pM)
 {
 	assert(pM != NULL);
-	 dbgprintf("MsgDestruct\t0x%lx, Ref now: %d\n", (unsigned long)pM, pM->iRefCount - 1); 
 	/* DEV Debugging only ! dbgprintf("MsgDestruct\t0x%lx, Ref now: %d\n", (unsigned long)pM, pM->iRefCount - 1); */
 	if(--pM->iRefCount == 0)
 	{
-		dbgprintf("MsgDestruct\t0x%lx, RefCount now 0, doing DESTROY\n", (unsigned long)pM); 
 		/* DEV Debugging Only! dbgprintf("MsgDestruct\t0x%lx, RefCount now 0, doing DESTROY\n", (unsigned long)pM); */
 		if(pM->pszUxTradMsg != NULL)
 			free(pM->pszUxTradMsg);
diff --git a/queue.c b/queue.c
index 19e92e9c..8ef20371 100644
--- a/queue.c
+++ b/queue.c
@@ -343,11 +343,6 @@ queueWorker(void *arg)
 				if(iRetLocal != RS_RET_OK)
 					dbgprintf("Queue 0x%lx: Consumer returned iRet %d\n",
 					          (unsigned long) pThis, iRetLocal);
-dbgprintf("QUEUE: consumer done\n");
-				iRetLocal = objDestruct(pUsr);
-				if(iRetLocal != RS_RET_OK)
-					dbgprintf("Queue 0x%lx: Destructor returned iRet %d\n",
-					          (unsigned long) pThis, iRetLocal);
 			} else {
 				dbgprintf("Queue 0x%lx: error %d dequeueing element - ignoring, but strange things "
 				          "may happen\n", (unsigned long) pThis, iRet);
diff --git a/syslogd.c b/syslogd.c
index bb0526c7..13ff8960 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1868,6 +1868,7 @@ msgConsumer(void *pUsr)
 	assert(pMsg != NULL);
 
 	processMsg(pMsg);
+	MsgDestruct(pMsg);
 
 	return RS_RET_OK;
 }
@@ -2339,12 +2340,6 @@ logmsg(int pri, msg_t *pMsg, int flags)
 	
 	pMsg->msgFlags = flags;
 	queueEnqObj(pMsgQueue, (void*) pMsg);
-#if 0
-	CHKiRet_Hdlr(queueEnqObj(pMsgQueue, (void*) pMsg)) {
-		/* if we have an error return, the pMsg was not destructed */
-		MsgDestruct(pMsg);
-	}
-#endif
 }