diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 11:07:15 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 11:07:15 +0200 |
commit | 8b9cef552de558ecfd130451c4dea22676184d38 (patch) | |
tree | d3b40f3bfc34f32bffbc08668dddd6c4e1a724d3 /tcps_sess.c | |
parent | de7726cbf0957384cc9261ac47d6bf65906739b5 (diff) | |
parent | b6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff) | |
download | rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.gz rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.xz rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.zip |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/debug.c
runtime/stream.c
tests/Makefile.am
tests/diskqueue.sh
tests/nettester.c
tools/omfile.c
Diffstat (limited to 'tcps_sess.c')
-rw-r--r-- | tcps_sess.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tcps_sess.c b/tcps_sess.c index a3cd2f30..0b91b6c4 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -60,8 +60,6 @@ DEFobjCurrIf(datetime) static int iMaxLine; /* maximum size of a single message */ -static int iNbrTimeUsed = 0; /* how often has previous time been used so far? */ - /* forward definitions */ static rsRetVal Close(tcps_sess_t *pThis); @@ -475,7 +473,6 @@ DataRcvd(tcps_sess_t *pThis, char *pData, size_t iLen) /* We now copy the message to the session buffer. */ pEnd = pData + iLen; /* this is one off, which is intensional */ - iNbrTimeUsed = 0; /* full time query */ while(pData < pEnd) { CHKiRet(processDataRcvd(pThis, *pData++, &stTime, ttGenTime, &multiSub)); } |