Merge branch 'beta'

2 files changed, 0 insertions, 9 deletions

diff --git a/ctok.c b/ctok.c
index aaffed3b..58a18b43 100644
--- a/ctok.c
+++ b/ctok.c
@@ -165,7 +165,6 @@ ctokGetWordFromStream(ctok_t *pThis, uchar *pWordBuf, size_t lenWordBuf)
 	/* push back the char that we have read too much */
 	CHKiRet(ctokUngetCharFromStream(pThis, c));
 
-dbgprintf("end ctokGetWordFromStream, stream now '%s'\n", pThis->pp);
 finalize_it:
 	RETiRet;
 }
@@ -230,8 +229,6 @@ ctokGetNumber(ctok_t *pThis, ctok_token_t *pToken)
 
 	CHKiRet(var.SetNumber(pToken->pVar, n));
 
-dbgprintf("number, number is: '%lld'\n", n);
-
 finalize_it:
 	RETiRet;
 }
@@ -268,8 +265,6 @@ ctokGetVar(ctok_t *pThis, ctok_token_t *pToken)
 	}
 	CHKiRet(rsCStrFinish(pStrB));
 
-dbgprintf("var, var is: '%s'\n", rsCStrGetSzStr(pstrVal));
-
 	CHKiRet(var.SetString(pToken->pVar, pstrVal));
 	pstrVal = NULL;
 
@@ -320,8 +315,6 @@ ctokGetSimpStr(ctok_t *pThis, ctok_token_t *pToken)
 	}
 	CHKiRet(rsCStrFinish(pStrB));
 
-dbgprintf("simpstr, str is: '%s'\n", rsCStrGetSzStr(pstrVal));
-
 	CHKiRet(var.SetString(pToken->pVar, pstrVal));
 	pstrVal = NULL;
 
diff --git a/net.c b/net.c
index 0dbf3bf2..ab669323 100644
--- a/net.c
+++ b/net.c
@@ -150,7 +150,6 @@ static rsRetVal AddAllowedSenderEntry(struct AllowedSenders **ppRoot, struct All
  */
 void clearAllowedSenders (struct AllowedSenders *pAllow)
 {
-dbgprintf("clearAllowedSenders(0x%lx)\n", (unsigned long) pAllow);
 	if (pAllow != NULL) {
 		if (pAllow->pNext != NULL)
 			clearAllowedSenders (pAllow->pNext);
@@ -860,7 +859,6 @@ void closeUDPListenSockets(int *pSockArr)
 {
 	register int i;
 
-dbgprintf("in closeUDPListenSockets()\n");
 	assert(pSockArr != NULL);
         if(pSockArr != NULL) {
 	        for (i = 0; i < *pSockArr; i++)