thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIN32: Fix Variable Shadowing Compiler Warnings.

Browse source 
These are emitted when using the MinGW compiler.
This commit is contained in:
D G Turner 2017-01-12 05:44:50 +00:00
parent 16439b346f
commit 4dc175a4c2
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backends/fs/windows/windows-fs.cpp
View file

@ -244,10 +244,10 @@ Common::WriteStream *WindowsFilesystemNode::createWriteStream() {
return StdioStream::makeFromPath(getPath(), true); return StdioStream::makeFromPath(getPath(), true);
} }
bool WindowsFilesystemNode::create(bool isDirectory) { bool WindowsFilesystemNode::create(bool isDirectoryFlag) {
bool success; bool success;
if (isDirectory) { if (isDirectoryFlag) {
success = CreateDirectory(toUnicode(_path.c_str()), NULL) != 0; success = CreateDirectory(toUnicode(_path.c_str()), NULL) != 0;
} else { } else {
success = CreateFile(toUnicode(_path.c_str()), GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL) != INVALID_HANDLE_VALUE; success = CreateFile(toUnicode(_path.c_str()), GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL) != INVALID_HANDLE_VALUE;
@ -264,12 +264,12 @@ bool WindowsFilesystemNode::create(bool isDirectory) {
_path += '\\'; _path += '\\';
} }
if (_isDirectory != isDirectory) warning("failed to create %s: got %s", isDirectory ? "directory" : "file", _isDirectory ? "directory" : "file"); if (_isDirectory != isDirectoryFlag) warning("failed to create %s: got %s", isDirectoryFlag ? "directory" : "file", _isDirectory ? "directory" : "file");
return _isDirectory == isDirectory; return _isDirectory == isDirectoryFlag;
} }
warning("WindowsFilesystemNode: Create%s() was a success, but GetFileAttributes() indicates there is no such %s", warning("WindowsFilesystemNode: Create%s() was a success, but GetFileAttributes() indicates there is no such %s",
isDirectory ? "Directory" : "File", isDirectory ? "directory" : "file"); isDirectoryFlag ? "Directory" : "File", isDirectoryFlag ? "directory" : "file");
return false; return false;
} }

2
backends/fs/windows/windows-fs.h
View file

@ -88,7 +88,7 @@ public:
virtual Common::SeekableReadStream *createReadStream(); virtual Common::SeekableReadStream *createReadStream();
virtual Common::WriteStream *createWriteStream(); virtual Common::WriteStream *createWriteStream();
virtual bool create(bool isDirectory); virtual bool create(bool isDirectoryFlag);
private: private:
/** /**