some cleanup

8 files changed, 0 insertions, 19 deletions

diff --git a/conf.c b/conf.c
index 288c10f3..cd34a3f5 100644
--- a/conf.c
+++ b/conf.c
@@ -762,7 +762,6 @@ dbgprintf("calling expression parser, pp %p ('%s')\n", *pline, *pline);
 		++(*pline);
 
 finalize_it:
-RUNLOG_VAR("%d", iRet);
 	if(iRet == RS_RET_SYNTAX_ERROR) {
 		errmsg.LogError(NO_ERRCODE, "syntax error in expression");
 	}
diff --git a/modules.c b/modules.c
index 4a7b2e19..5f5f19dd 100644
--- a/modules.c
+++ b/modules.c
@@ -282,7 +282,6 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)()), uchar *
 	addModToList(pNew);
 
 finalize_it:
-RUNLOG_VAR("%d", iRet);
 	if(iRet != RS_RET_OK) {
 		if(pNew != NULL)
 			moduleDestruct(pNew);
diff --git a/obj.c b/obj.c
index 910afe89..b7ae5332 100644
--- a/obj.c
+++ b/obj.c
@@ -1038,7 +1038,6 @@ RegisterObj(uchar *pszObjName, objInfo_t *pInfo)
 
 finalize_it:
 	if(iRet != RS_RET_OK) {
-RUNLOG_VAR("%p", errmsg.LogError);
 		errmsg.LogError(NO_ERRCODE, "registering object '%s' failed with error code %d", pszObjName, iRet);
 	}
 
@@ -1175,16 +1174,13 @@ objClassInit(void)
 	CHKiRet(objGetObjInterface(&obj)); /* get ourselves ;) */
 
 	/* init classes we use (limit to as few as possible!) */
-RUNLOG_VAR("%p", errmsg.LogError);
 	CHKiRet(errmsgClassInit());
 	CHKiRet(cfsyslineInit());
 	CHKiRet(varClassInit());
 	CHKiRet(moduleClassInit());
 	CHKiRet(objUse(var, CORE_COMPONENT));
 	CHKiRet(objUse(module, CORE_COMPONENT));
-RUNLOG_VAR("%p", errmsg.LogError);
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-RUNLOG_VAR("%p", errmsg.LogError);
 
 finalize_it:
 	RETiRet;
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 1d26de4b..e8a318bb 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -86,7 +86,6 @@ static int bIgnoreTimestamp = 1; /* ignore timestamps present in the incoming me
 static rsRetVal setSystemLogTimestampIgnore(void __attribute__((unused)) *pVal, int iNewVal)
 {
 	DEFiRet;
-RUNLOG_VAR("%d", iNewVal);
 	funixFlags[0] = iNewVal ? ADDDATE : NOFLAG;
 	RETiRet;
 }
diff --git a/syslogd.c b/syslogd.c
index 2eec6619..303358d1 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -899,7 +899,6 @@ logmsgInternal(int pri, char *msg, int flags)
 	pMsg->iFacility = LOG_FAC(pri);
 	pMsg->iSeverity = LOG_PRI(pri);
 	pMsg->bParseHOSTNAME = 0;
-RUNLOG_VAR("%p", datetime.getCurrTime);
 	datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */
 	flags |= INTERNAL_MSG;
 
diff --git a/tcps_sess.c b/tcps_sess.c
index c86bcf8d..9f64be11 100644
--- a/tcps_sess.c
+++ b/tcps_sess.c
@@ -73,7 +73,6 @@ static rsRetVal
 tcps_sessConstructFinalize(tcps_sess_t __attribute__((unused)) *pThis)
 {
 	DEFiRet;
-RUNLOG_VAR("%p", pThis->objData.pszName);
 	ISOBJ_TYPE_assert(pThis, tcps_sess);
 	if(pThis->pSrv->OnSessConstructFinalize != NULL) {
 		CHKiRet(pThis->pSrv->OnSessConstructFinalize(&pThis->pUsr));
@@ -87,7 +86,6 @@ finalize_it:
 /* destructor for the tcps_sess object */
 BEGINobjDestruct(tcps_sess) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDestruct(tcps_sess)
-RUNLOG_VAR("%p", pThis->objData.pszName);
 	if(pThis->pSrv->pOnSessDestruct != NULL) {
 		pThis->pSrv->pOnSessDestruct(&pThis->pUsr);
 	}
@@ -111,7 +109,6 @@ SetHost(tcps_sess_t *pThis, uchar *pszHost)
 	DEFiRet;
 
 	ISOBJ_TYPE_assert(pThis, tcps_sess);
-RUNLOG_VAR("%p", pThis->objData.pszName);
 
 	if(pThis->fromHost != NULL) {
 		free(pThis->fromHost);
@@ -149,11 +146,9 @@ static rsRetVal
 SetTcpsrv(tcps_sess_t *pThis, tcpsrv_t *pSrv)
 {
 	DEFiRet;
-RUNLOG_VAR("%p", pThis->objData.pszName);
 	ISOBJ_TYPE_assert(pThis, tcps_sess);
 	ISOBJ_TYPE_assert(pSrv, tcpsrv);
 	pThis->pSrv = pSrv;
-RUNLOG_VAR("%p", pThis->objData.pszName);
 	RETiRet;
 }
 
@@ -429,7 +424,6 @@ ENDobjQueryInterface(tcps_sess)
  * rgerhards, 2008-02-29
  */
 BEGINObjClassInit(tcps_sess, 1, OBJ_IS_CORE_MODULE) /* class, version - CHANGE class also in END MACRO! */
-RUNLOG_STR("initializing tcps_sess class");
 	/* request objects we use */
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 
diff --git a/tcpsrv.c b/tcpsrv.c
index 8b0d6d81..2831d038 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -438,7 +438,6 @@ SessAccept(tcpsrv_t *pThis, tcps_sess_t **ppSess, int fd)
 
 	ISOBJ_TYPE_assert(pThis, tcpsrv);
 
-RUNLOG_VAR("%p", pThis->pUsr);
 	newConn = accept(fd, (struct sockaddr*) &addr, &addrlen);
 	if (newConn < 0) {
 		errmsg.LogError(NO_ERRCODE, "tcp accept, ignoring error and connection request");
@@ -496,16 +495,13 @@ RUNLOG_VAR("%p", pThis->pUsr);
 	 * means we can finally fill in the session object.
 	 */
 	CHKiRet(tcps_sess.SetHost(pThis->pSessions[iSess], fromHost));
-RUNLOG_VAR("%d", newConn);
 	CHKiRet(tcps_sess.SetSock(pThis->pSessions[iSess], newConn));
 	CHKiRet(tcps_sess.SetMsgIdx(pThis->pSessions[iSess], 0));
 	CHKiRet(tcps_sess.ConstructFinalize(pThis->pSessions[iSess]));
 
 finalize_it:
-RUNLOG_VAR("%d", iRet);
 	if(iRet != RS_RET_OK) {
 		if(iSess != -1) {
-RUNLOG_VAR("%d", iSess);
 			if(pThis->pSessions[iSess] != NULL)
 				tcps_sess.Destruct(&pThis->pSessions[iSess]);
 		}
diff --git a/wti.c b/wti.c
index aae456d8..2386dee9 100644
--- a/wti.c
+++ b/wti.c
@@ -303,7 +303,6 @@ wtiWorkerCancelCleanup(void *arg)
 	dbgprintf("%s: cancelation cleanup handler called.\n", wtiGetDbgHdr(pThis));
 	
 	/* call user supplied handler (that one e.g. requeues the element) */
-RUNLOG_VAR("%p", pThis->pUsrp);
 	pWtp->pfOnWorkerCancel(pThis->pWtp->pUsr, pThis->pUsrp);
 
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave);