[Scummvm-git-logs] scummvm master -> c0a40e2e88313a8954866add92ec9efdc1531298

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c0a40e2e88 CLOUD: Fix Further Variable Shadowing Compiler Warnings.


Commit: c0a40e2e88313a8954866add92ec9efdc1531298
    https://github.com/scummvm/scummvm/commit/c0a40e2e88313a8954866add92ec9efdc1531298
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-16T13:09:58Z

Commit Message:
CLOUD: Fix Further Variable Shadowing Compiler Warnings.

Changed paths:
    backends/networking/sdl_net/reader.cpp


diff --git a/backends/networking/sdl_net/reader.cpp b/backends/networking/sdl_net/reader.cpp
index 113d928..27254de 100644
--- a/backends/networking/sdl_net/reader.cpp
+++ b/backends/networking/sdl_net/reader.cpp
@@ -178,7 +178,7 @@ void Reader::parseFirstLine(const Common::String &headersToParse) {
 		const char *position = strstr(cstr, "\r\n");
 		if (position) { //we have at least one line - and we want the first one
 			//"<METHOD> <path> HTTP/<VERSION>\r\n"
-			Common::String methodParsed, path, http, buf;
+			Common::String methodParsed, pathParsed, http, buf;
 			uint32 length = position - cstr;
 			if (headersSize > length)
 				headersSize = length;
@@ -188,8 +188,8 @@ void Reader::parseFirstLine(const Common::String &headersToParse) {
 				if (headersToParse[i] == ' ' || i == headersSize - 1) {
 					if (methodParsed == "") {
 						methodParsed = buf;
-					} else if (path == "") {
-						path = buf;
+					} else if (pathParsed == "") {
+						pathParsed = buf;
 					} else if (http == "") {
 						http = buf;
 					} else {
@@ -209,7 +209,7 @@ void Reader::parseFirstLine(const Common::String &headersToParse) {
 				bad = true;
 
 			_method = methodParsed;
-			parsePathQueryAndAnchor(path);
+			parsePathQueryAndAnchor(pathParsed);
 		}
 	}