Mercurial > hg > orthanc

comparison Core/HttpClient.cpp @ 3799:320a2d224902

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Wed, 01 Apr 2020 10:15:33 +0200
parents f6a73611ec5c
children
comparison
equal deleted inserted replaced
3798:c38b82bb6fd3 3799:320a2d224902
232 while (sourceRemainingSize < curlBufferSize && hasMore) 232 while (sourceRemainingSize < curlBufferSize && hasMore)
233 { 233 {
234 if (sourceRemainingSize > 0) 234 if (sourceRemainingSize > 0)
235 { 235 {
236 // transmit the end of current source buffer 236 // transmit the end of current source buffer
237 memcpy(curlBuffer + curlBufferFilledSize, sourceBuffer_.data() + sourceBufferTransmittedSize_, sourceRemainingSize); 237 memcpy(curlBuffer + curlBufferFilledSize,
238 sourceBuffer_.data() + sourceBufferTransmittedSize_, sourceRemainingSize);
238 239
239 curlBufferFilledSize += sourceRemainingSize; 240 curlBufferFilledSize += sourceRemainingSize;
240 } 241 }
241 242
242 // start filling a new source buffer 243 // start filling a new source buffer
246 hasMore = body_->ReadNextChunk(sourceBuffer_); 247 hasMore = body_->ReadNextChunk(sourceBuffer_);
247 248
248 sourceRemainingSize = sourceBuffer_.size(); 249 sourceRemainingSize = sourceBuffer_.size();
249 } 250 }
250 251
251 if (sourceRemainingSize > 0 && (curlBufferSize - curlBufferFilledSize) > 0) 252 if (sourceRemainingSize > 0 &&
253 curlBufferSize > curlBufferFilledSize)
252 { 254 {
253 size_t s = std::min(sourceRemainingSize, curlBufferSize - curlBufferFilledSize); 255 size_t s = std::min(sourceRemainingSize, curlBufferSize - curlBufferFilledSize);
254 256
255 memcpy(curlBuffer + curlBufferFilledSize, sourceBuffer_.data() + sourceBufferTransmittedSize_, s); 257 memcpy(curlBuffer + curlBufferFilledSize,
258 sourceBuffer_.data() + sourceBufferTransmittedSize_, s);
256 259
257 sourceBufferTransmittedSize_ += s; 260 sourceBufferTransmittedSize_ += s;
258 curlBufferFilledSize += s; 261 curlBufferFilledSize += s;
259 } 262 }
260 263