diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-24 17:58:03 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-24 17:58:03 +0200 |
commit | ffe496e2c21447d3d2efe770d788623d6fa41103 (patch) | |
tree | 3aff764ec3c3cce1f194041186280a75a554a36c /runtime/stream.c | |
parent | 99d6dc01d22b1283e992cec481e4f2a03ee74340 (diff) | |
parent | 205114176d08cf662faca67077598061404f0d24 (diff) | |
download | rsyslog-ffe496e2c21447d3d2efe770d788623d6fa41103.tar.gz rsyslog-ffe496e2c21447d3d2efe770d788623d6fa41103.tar.bz2 rsyslog-ffe496e2c21447d3d2efe770d788623d6fa41103.zip |
Merge branch 'master' into master-ratelimit
Conflicts:
doc/v7compatibility.html
Diffstat (limited to 'runtime/stream.c')
-rw-r--r-- | runtime/stream.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 064cb42a..aee4d2ad 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -1175,7 +1175,6 @@ static rsRetVal doZipWrite(strm_t *pThis, uchar *pBuf, size_t lenBuf, int bFlush) { int zRet; /* zlib return state */ - sbool bzInitDone = RSFALSE; DEFiRet; unsigned outavail; assert(pThis != NULL); @@ -1194,7 +1193,6 @@ doZipWrite(strm_t *pThis, uchar *pBuf, size_t lenBuf, int bFlush) } pThis->bzInitDone = RSTRUE; } - bzInitDone = RSTRUE; /* now doing the compression */ pThis->zstrm.next_in = (Bytef*) pBuf; |