Author: Tsantilas Christos <chtsanti@users.sourceforge.net>

More >2GB fixes. BodyPipe::unproducedSize() method should also return an uint64_t

diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc
index 45c9c4813b5ea5d2c57243c3381719c350209884..71c12b00c17278cc3a4bf8c14a5ad5173e2b5298 100644 (file)
--- a/src/BodyPipe.cc
+++ b/src/BodyPipe.cc
@@ -77,7 +77,7 @@ bool BodyPipe::exhausted() const
        return !expectMoreAfter(theGetSize);
 }
 
-size_t BodyPipe::unproducedSize() const
+uint64_t BodyPipe::unproducedSize() const
 {
        return bodySize() - thePutSize; // bodySize() asserts that size is known
 }
@@ -106,7 +106,7 @@ size_t
 BodyPipe::putMoreData(const char *buf, size_t size)
 {
        if (bodySizeKnown())
-               size = XMIN(size, unproducedSize());
+               size = XMIN((uint64_t)size, unproducedSize());
 
        const size_t spaceSize = static_cast<size_t>(theBuf.potentialSpaceSize());
        if ((size = XMIN(size, spaceSize))) {

diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index 25a3fa29d41df6746a7e73233d5272bfe70c6ff7..6ff0d3d2bd56927819bce904c9a9cb89494fc808 100644 (file)
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -92,7 +92,7 @@ class BodyPipe: public RefCountable {
                size_t putMoreData(const char *buf, size_t size);
                bool mayNeedMoreData() const { return !bodySizeKnown() || needsMoreData(); }
                bool needsMoreData() const { return bodySizeKnown() && unproducedSize() > 0; }
-               size_t unproducedSize() const; // size of still unproduced data
+               uint64_t unproducedSize() const; // size of still unproduced data
 
                // called by consumers
                bool setConsumerIfNotLate(Consumer *aConsumer);