publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify stream availability handling

Browse Source 
Just have a simply number of bytes argument to avoid a lot of
complexity.
This commit is contained in:
Pierre Ossman
2020-05-19 21:07:05 +02:00
committed by Lauri Kasanen
parent 92c7695981
commit 57a3c3bba8
20 changed files with 67 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/rdr/ZlibOutStream.cxx
View File

@@ -95,18 +95,18 @@ void ZlibOutStream::flush()
ptr = start;
}
size_t ZlibOutStream::overrun(size_t itemSize, size_t nItems)
void ZlibOutStream::overrun(size_t needed)
{
#ifdef ZLIBOUT_DEBUG
fprintf(stderr,"zos overrun\n");
#endif
if (itemSize > bufSize)
throw Exception("ZlibOutStream overrun: max itemSize exceeded");
if (needed > bufSize)
throw Exception("ZlibOutStream overrun: buffer size exceeded");
checkCompressionLevel();
while (avail() < itemSize) {
while (avail() < needed) {
zs->next_in = start;
zs->avail_in = ptr - start;
@@ -126,13 +126,6 @@ size_t ZlibOutStream::overrun(size_t itemSize, size_t nItems)
ptr -= zs->next_in - start;
}
}
size_t nAvail;
nAvail = avail() / itemSize;
if (nAvail < nItems)
return nAvail;
return nItems;
}
void ZlibOutStream::deflate(int flush)