From: hno <>
Date: Tue, 2 Oct 2007 04:48:34 +0000 (+0000)
Subject: Author: Tsantilas Christos <chtsanti@users.sourceforge.net>
X-Git-Tag: SQUID_3_0_STABLE1~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=610d8f3b84b0e67d2a3609cd0ad31264035951e3;p=thirdparty%2Fsquid.git

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 45c9c4813b..71c12b00c1 100644
--- 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 25a3fa29d4..6ff0d3d2bd 100644
--- 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);