diff options
author | Pierre Ossman <ossman@cendio.se> | 2019-12-20 07:39:06 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2019-12-20 07:39:06 +0100 |
commit | d461f7fdb8b01f655260ea2f495ece700f3c9898 (patch) | |
tree | 5113b5a2844de4ce1469864d56c9786b3c4d63b0 /common/rdr/FdOutStream.h | |
parent | c59f195d0ef2922bc163ac7cabfc94b9f1b25860 (diff) | |
parent | 05e28490873a861379c943bf616614b78b558b89 (diff) | |
download | tigervnc-d461f7fdb8b01f655260ea2f495ece700f3c9898.tar.gz tigervnc-d461f7fdb8b01f655260ea2f495ece700f3c9898.zip |
Merge branch 'secfix' of https://github.com/CendioOssman/tigervnc
Diffstat (limited to 'common/rdr/FdOutStream.h')
-rw-r--r-- | common/rdr/FdOutStream.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/rdr/FdOutStream.h b/common/rdr/FdOutStream.h index b7f6cb01..ed84fdb5 100644 --- a/common/rdr/FdOutStream.h +++ b/common/rdr/FdOutStream.h @@ -34,7 +34,7 @@ namespace rdr { public: - FdOutStream(int fd, bool blocking=true, int timeoutms=-1, int bufSize=0); + FdOutStream(int fd, bool blocking=true, int timeoutms=-1, size_t bufSize=0); virtual ~FdOutStream(); void setTimeout(int timeoutms); @@ -42,20 +42,20 @@ namespace rdr { int getFd() { return fd; } void flush(); - int length(); + size_t length(); int bufferUsage(); unsigned getIdleTime(); private: - int overrun(int itemSize, int nItems); - int writeWithTimeout(const void* data, int length, int timeoutms); + size_t overrun(size_t itemSize, size_t nItems); + size_t writeWithTimeout(const void* data, size_t length, int timeoutms); int fd; bool blocking; int timeoutms; - int bufSize; - int offset; + size_t bufSize; + size_t offset; U8* start; U8* sentUpTo; struct timeval lastWrite; |