From 199f01614ca45854a820878b5d0f91f729fc379c Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 15 Jul 2013 17:47:04 +0200
Subject: cleanup

---
 plugins/imptcp/imptcp.c | 12 ------------
 tools/omfwd.c           |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
index a568e5fe..8a99396b 100644
--- a/plugins/imptcp/imptcp.c
+++ b/plugins/imptcp/imptcp.c
@@ -830,12 +830,6 @@ DataRcvdUncompressed(ptcpsess_t *pThis, char *pData, size_t iLen, struct syslogT
 	assert(pData != NULL);
 	assert(iLen > 0);
 
-{size_t i;
-dbgprintf("Data received(%u): '", (unsigned) iLen);
-for(i=0;i<iLen;++i)
-  dbgprintf("%c", pData[i]);
-dbgprintf("'\n");
-}
 	if(ttGenTime == 0)
 		datetime.getCurrTime(stTime, &ttGenTime);
 	multiSub.ppMsgs = pMsgs;
@@ -867,16 +861,12 @@ DataRcvdCompressed(ptcpsess_t *pThis, char *buf, size_t len)
 	// TODO: can we do stats counters? Even if they are not 100% correct under all cases,
 	// by simply updating the input and output sizes?
 	uint64_t outtotal;
-dbgprintf("DDDD: in DataRcvdCompressed, init done %d\n", pThis->bzInitDone);
 
 	datetime.getCurrTime(&stTime, &ttGenTime);
 	outtotal = 0;
 
 	if(!pThis->bzInitDone) {
-dbgprintf("DDDD; inside zlib init code\n");
 		/* allocate deflate state */
-		pThis->zstrm.next_in = (Bytef*) buf;
-		pThis->zstrm.avail_in = 0;
 		pThis->zstrm.zalloc = Z_NULL;
 		pThis->zstrm.zfree = Z_NULL;
 		pThis->zstrm.opaque = Z_NULL;
@@ -1044,7 +1034,6 @@ addLstn(ptcpsrv_t *pSrv, int sock, int isIPv6)
 	iRet = addEPollSock(epolld_lstn, pLstn, sock, &pLstn->epd);
 
 finalize_it:
-dbgprintf("DDDD: addLstn return %d\n", iRet);
 	RETiRet;
 }
 
@@ -1813,7 +1802,6 @@ shutdownSrv(ptcpsrv_t *pSrv)
 	ptcplstn_t *pLstn, *lstnDel;
 	ptcpsess_t *pSess, *sessDel;
 
-dbgprintf("DDDD: enter shutdownSrv\n");
 	/* listeners */
 	pLstn = pSrv->pLstn;
 	while(pLstn != NULL) {
diff --git a/tools/omfwd.c b/tools/omfwd.c
index c7c3e32b..42311bcd 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -255,7 +255,6 @@ pData->bIsConnected = 0; // TODO: remove this variable altogether
 static inline void
 DestructTCPInstanceData(instanceData *pData)
 {
-dbgprintf("DDDD: in DestructTCPInstanceData\n");
 	assert(pData != NULL);
 	doZipFinish(pData);
 	if(pData->pNetstrm != NULL)
@@ -498,7 +497,6 @@ TCPSendBufCompressed(instanceData *pData, uchar *buf, unsigned len, sbool bIsFlu
 		op = Z_SYNC_FLUSH;
 	else
 		op = Z_NO_FLUSH;
-dbgprintf("DDDD: op: %d (SYNC_FLUSH %d)\n", op, Z_SYNC_FLUSH);
 	/* run deflate() on buffer until everything has been compressed */
 	do {
 		DBGPRINTF("omfwd: in deflate() loop, avail_in %d, total_in %ld, isFlush %d\n", pData->zstrm.avail_in, pData->zstrm.total_in, bIsFlush);
@@ -608,7 +606,6 @@ static rsRetVal TCPSendPrepRetry(void *pvData)
 {
 	DEFiRet;
 	instanceData *pData = (instanceData *) pvData;
-dbgprintf("TCPSendPrepRetry performs a DestructTCPInstanceData\n");
 
 	assert(pData != NULL);
 	DestructTCPInstanceData(pData);
-- 
cgit v1.2.3