diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:00:14 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:00:14 +0200 |
commit | 33316de49b7775ac40dd0ec0f4b7ff6256ccde78 (patch) | |
tree | edeec9b609baf2011838f7dbfcb6fc3bd82f29e7 /tcpsrv.c | |
parent | aa9426f683fa6af9280bc63050ee0187ba4c57e1 (diff) | |
parent | 35ea061f62cf0cbae074b2df47dc6b462da4fd20 (diff) | |
download | rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.tar.gz rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.tar.bz2 rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
tests/imtcp-multiport.sh
tests/manytcp.sh
tests/memq-persist.sh
Diffstat (limited to 'tcpsrv.c')
-rw-r--r-- | tcpsrv.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -97,7 +97,6 @@ addNewLstnPort(tcpsrv_t *pThis, uchar *pszPort) ISOBJ_TYPE_assert(pThis, tcpsrv); -dbgprintf("XXX: tcpsrv.c add port %s, name '%s'\n", pszPort, pThis->pszInputName); /* create entry */ CHKmalloc(pEntry = malloc(sizeof(tcpLstnPortList_t))); pEntry->pszPort = pszPort; @@ -267,7 +266,6 @@ addTcpLstn(void *pUsr, netstrm_t *pLstn) tcpsrv_t *pThis = pPortList->pSrv; DEFiRet; -dbgprintf("XXX: addTcpLst name %s\n", pPortList->pszInputName); ISOBJ_TYPE_assert(pThis, tcpsrv); ISOBJ_TYPE_assert(pLstn, netstrm); @@ -326,7 +324,6 @@ create_tcp_socket(tcpsrv_t *pThis) /* init all configured ports */ pEntry = pThis->pLstnPorts; while(pEntry != NULL) { -dbgprintf("XXX: tcpsrv.c create_tcp_socket do port %s\n", pEntry->pszPort); CHKiRet(initTCPListener(pThis, pEntry)); pEntry = pEntry->pNext; } |