diff options
| author | D G Turner | 2017-01-10 04:14:28 +0000 | 
|---|---|---|
| committer | D G Turner | 2017-01-10 04:14:28 +0000 | 
| commit | 1bdeff2d562ca76bf4dd1ac5b0f97157e6570427 (patch) | |
| tree | d3645647fc9f7ae3d4099f789fa4d5e644c15b05 /backends/networking | |
| parent | cff454d5e77abfa1d62aa5d0f0d03643a08dedab (diff) | |
| download | scummvm-rg350-1bdeff2d562ca76bf4dd1ac5b0f97157e6570427.tar.gz scummvm-rg350-1bdeff2d562ca76bf4dd1ac5b0f97157e6570427.tar.bz2 scummvm-rg350-1bdeff2d562ca76bf4dd1ac5b0f97157e6570427.zip  | |
CLOUD: Fix Two Variable Shadowing Compiler Warnings.
Diffstat (limited to 'backends/networking')
| -rw-r--r-- | backends/networking/curl/networkreadstream.cpp | 18 | ||||
| -rw-r--r-- | backends/networking/curl/networkreadstream.h | 2 | 
2 files changed, 10 insertions, 10 deletions
diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp index b4516701a7..4da18ce311 100644 --- a/backends/networking/curl/networkreadstream.cpp +++ b/backends/networking/curl/networkreadstream.cpp @@ -228,19 +228,19 @@ Common::String NetworkReadStream::responseHeaders() const {  }  uint32 NetworkReadStream::fillWithSendingContents(char *bufferToFill, uint32 maxSize) { -	uint32 size = _sendingContentsSize - _sendingContentsPos; -	if (size > maxSize) -		size = maxSize; -	for (uint32 i = 0; i < size; ++i) { +	uint32 sendSize = _sendingContentsSize - _sendingContentsPos; +	if (sendSize > maxSize) +		sendSize = maxSize; +	for (uint32 i = 0; i < sendSize; ++i) {  		bufferToFill[i] = _sendingContentsBuffer[_sendingContentsPos + i];  	} -	_sendingContentsPos += size; -	return size; +	_sendingContentsPos += sendSize; +	return sendSize;  } -uint32 NetworkReadStream::addResponseHeaders(char *buffer, uint32 size) { -	_responseHeaders += Common::String(buffer, size); -	return size; +uint32 NetworkReadStream::addResponseHeaders(char *buffer, uint32 bufferSize) { +	_responseHeaders += Common::String(buffer, bufferSize); +	return bufferSize;  }  double NetworkReadStream::getProgress() const { diff --git a/backends/networking/curl/networkreadstream.h b/backends/networking/curl/networkreadstream.h index 62a3e41d9b..275d8dbd79 100644 --- a/backends/networking/curl/networkreadstream.h +++ b/backends/networking/curl/networkreadstream.h @@ -128,7 +128,7 @@ public:  	*  	* @returns how many bytes were actually read  	*/ -	uint32 addResponseHeaders(char *buffer, uint32 size); +	uint32 addResponseHeaders(char *buffer, uint32 bufferSize);  	/** Returns a number in range [0, 1], where 1 is "complete". */  	double getProgress() const;  | 
