diff options
author | D G Turner | 2017-01-12 08:22:40 +0000 |
---|---|---|
committer | D G Turner | 2017-01-12 08:22:40 +0000 |
commit | adbf18abca0d6a43830645ab0d8ce492bbbd4971 (patch) | |
tree | 60f64382d27a1fcede127c89c2fdd868007c3d58 /backends/fs | |
parent | 6c4b89e6dc439299af68afaa75b366e4aece45c9 (diff) | |
download | scummvm-rg350-adbf18abca0d6a43830645ab0d8ce492bbbd4971.tar.gz scummvm-rg350-adbf18abca0d6a43830645ab0d8ce492bbbd4971.tar.bz2 scummvm-rg350-adbf18abca0d6a43830645ab0d8ce492bbbd4971.zip |
BACKENDS: Fix Shadowing Compiler Warning for isDirectory symbol.
This should ensure that any future cut-and-paste for new backends do not
repeat this same warning issue.
Diffstat (limited to 'backends/fs')
-rw-r--r-- | backends/fs/abstract-fs.h | 4 | ||||
-rw-r--r-- | backends/fs/amigaos4/amigaos4-fs.cpp | 2 | ||||
-rw-r--r-- | backends/fs/amigaos4/amigaos4-fs.h | 2 | ||||
-rw-r--r-- | backends/fs/chroot/chroot-fs.cpp | 2 | ||||
-rw-r--r-- | backends/fs/chroot/chroot-fs.h | 2 | ||||
-rw-r--r-- | backends/fs/ds/ds-fs.cpp | 8 | ||||
-rw-r--r-- | backends/fs/ds/ds-fs.h | 6 | ||||
-rw-r--r-- | backends/fs/n64/n64-fs.cpp | 2 | ||||
-rw-r--r-- | backends/fs/n64/n64-fs.h | 2 | ||||
-rw-r--r-- | backends/fs/posix/posix-fs.cpp | 10 | ||||
-rw-r--r-- | backends/fs/posix/posix-fs.h | 2 | ||||
-rw-r--r-- | backends/fs/ps2/ps2-fs.cpp | 2 | ||||
-rw-r--r-- | backends/fs/ps2/ps2-fs.h | 2 | ||||
-rw-r--r-- | backends/fs/psp/psp-fs.cpp | 2 | ||||
-rw-r--r-- | backends/fs/psp/psp-fs.h | 2 | ||||
-rw-r--r-- | backends/fs/symbian/symbian-fs.cpp | 2 | ||||
-rw-r--r-- | backends/fs/symbian/symbian-fs.h | 2 |
17 files changed, 27 insertions, 27 deletions
diff --git a/backends/fs/abstract-fs.h b/backends/fs/abstract-fs.h index 24286b649d..28ea3bbecd 100644 --- a/backends/fs/abstract-fs.h +++ b/backends/fs/abstract-fs.h @@ -195,11 +195,11 @@ public: /** * Creates a file referred by this node. * - * @param isDirectory true if created file must be a directory + * @param isDirectoryFlag true if created file must be a directory * * @return true if file is created successfully */ - virtual bool create(bool isDirectory) = 0; + virtual bool create(bool isDirectoryFlag) = 0; }; diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 24a8fb98ad..09ba3a1c83 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -443,7 +443,7 @@ Common::WriteStream *AmigaOSFilesystemNode::createWriteStream() { return StdioStream::makeFromPath(getPath(), true); } -bool AmigaOSFilesystemNode::create(bool isDirectory) { +bool AmigaOSFilesystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/amigaos4/amigaos4-fs.h b/backends/fs/amigaos4/amigaos4-fs.h index 3ed45d3f77..c86bb4c57a 100644 --- a/backends/fs/amigaos4/amigaos4-fs.h +++ b/backends/fs/amigaos4/amigaos4-fs.h @@ -116,7 +116,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); }; diff --git a/backends/fs/chroot/chroot-fs.cpp b/backends/fs/chroot/chroot-fs.cpp index be6805bbd8..ac7cde3398 100644 --- a/backends/fs/chroot/chroot-fs.cpp +++ b/backends/fs/chroot/chroot-fs.cpp @@ -108,7 +108,7 @@ Common::WriteStream *ChRootFilesystemNode::createWriteStream() { return _realNode->createWriteStream(); } -bool ChRootFilesystemNode::create(bool /*isDir*/) { +bool ChRootFilesystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/chroot/chroot-fs.h b/backends/fs/chroot/chroot-fs.h index e0ecc1c47e..76902bc92a 100644 --- a/backends/fs/chroot/chroot-fs.h +++ b/backends/fs/chroot/chroot-fs.h @@ -49,7 +49,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); private: static Common::String addPathComponent(const Common::String &path, const Common::String &component); diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 83b1295838..035178dbb4 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -211,7 +211,7 @@ Common::WriteStream *DSFileSystemNode::createWriteStream() { return Common::wrapBufferedWriteStream(stream, WRITE_BUFFER_SIZE); } -bool DSFileSystemNode::create(bool isDirectory) { +bool DSFileSystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } @@ -271,7 +271,7 @@ GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path) { _path = path; } -GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path, bool isDir) { +GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path, bool isDirectoryFlag) { //consolePrintf("'%s'",path.c_str()); int lastSlash = 3; @@ -284,7 +284,7 @@ GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path, bool isDir) _displayName = Common::String(path.c_str() + lastSlash + 1); _path = path; _isValid = true; - _isDirectory = isDir; + _isDirectory = isDirectoryFlag; } @@ -398,7 +398,7 @@ Common::WriteStream *GBAMPFileSystemNode::createWriteStream() { return Common::wrapBufferedWriteStream(stream, WRITE_BUFFER_SIZE); } -bool GBAMPFileSystemNode::create(bool isDirectory) { +bool GBAMPFileSystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index 939d1a1555..12dd6d6a59 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -91,7 +91,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); /** * Returns the zip file this node points to. @@ -132,7 +132,7 @@ public: * @param path String with the path the new node should point to. * @param path true if path is a directory, false otherwise. */ - GBAMPFileSystemNode(const Common::String &path, bool isDirectory); + GBAMPFileSystemNode(const Common::String &path, bool isDirectoryFlag); /** * Copy constructor. @@ -157,7 +157,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); }; struct fileHandle { diff --git a/backends/fs/n64/n64-fs.cpp b/backends/fs/n64/n64-fs.cpp index d568500d30..5a131c0305 100644 --- a/backends/fs/n64/n64-fs.cpp +++ b/backends/fs/n64/n64-fs.cpp @@ -160,7 +160,7 @@ Common::WriteStream *N64FilesystemNode::createWriteStream() { return RomfsStream::makeFromPath(getPath(), true); } -bool N64FilesystemNode::create(bool isDirectory) { +bool N64FilesystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/n64/n64-fs.h b/backends/fs/n64/n64-fs.h index d520ad5be6..b2de8a4bc4 100644 --- a/backends/fs/n64/n64-fs.h +++ b/backends/fs/n64/n64-fs.h @@ -73,7 +73,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); }; #endif diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index ce5715210a..4434bcba97 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -253,10 +253,10 @@ Common::WriteStream *POSIXFilesystemNode::createWriteStream() { return StdioStream::makeFromPath(getPath(), true); } -bool POSIXFilesystemNode::create(bool isDir) { +bool POSIXFilesystemNode::create(bool isDirectoryFlag) { bool success; - if (isDir) { + if (isDirectoryFlag) { success = mkdir(_path.c_str(), 0755) == 0; } else { int fd = open(_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0755); @@ -270,12 +270,12 @@ bool POSIXFilesystemNode::create(bool isDir) { if (success) { setFlags(); if (_isValid) { - if (_isDirectory != isDir) warning("failed to create %s: got %s", isDir ? "directory" : "file", _isDirectory ? "directory" : "file"); - return _isDirectory == isDir; + if (_isDirectory != isDirectoryFlag) warning("failed to create %s: got %s", isDirectoryFlag ? "directory" : "file", _isDirectory ? "directory" : "file"); + return _isDirectory == isDirectoryFlag; } warning("POSIXFilesystemNode: %s() was a success, but stat indicates there is no such %s", - isDir ? "mkdir" : "creat", isDir ? "directory" : "file"); + isDirectoryFlag ? "mkdir" : "creat", isDirectoryFlag ? "directory" : "file"); return false; } diff --git a/backends/fs/posix/posix-fs.h b/backends/fs/posix/posix-fs.h index 4ebce7e9d9..5a6b6bd2bd 100644 --- a/backends/fs/posix/posix-fs.h +++ b/backends/fs/posix/posix-fs.h @@ -73,7 +73,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); private: /** diff --git a/backends/fs/ps2/ps2-fs.cpp b/backends/fs/ps2/ps2-fs.cpp index 8391e063a0..eba740e948 100644 --- a/backends/fs/ps2/ps2-fs.cpp +++ b/backends/fs/ps2/ps2-fs.cpp @@ -441,7 +441,7 @@ Common::WriteStream *Ps2FilesystemNode::createWriteStream() { return PS2FileStream::makeFromPath(getPath(), true); } -bool Ps2FilesystemNode::create(bool isDirectory) { +bool Ps2FilesystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/ps2/ps2-fs.h b/backends/fs/ps2/ps2-fs.h index c9da434535..ca476eca9f 100644 --- a/backends/fs/ps2/ps2-fs.h +++ b/backends/fs/ps2/ps2-fs.h @@ -96,7 +96,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); int getDev() { return 0; } }; diff --git a/backends/fs/psp/psp-fs.cpp b/backends/fs/psp/psp-fs.cpp index 6bd5e93435..c69592ea99 100644 --- a/backends/fs/psp/psp-fs.cpp +++ b/backends/fs/psp/psp-fs.cpp @@ -239,7 +239,7 @@ Common::WriteStream *PSPFilesystemNode::createWriteStream() { return Common::wrapBufferedWriteStream(stream, WRITE_BUFFER_SIZE); } -bool PSPFilesystemNode::create(bool isDirectory) { +bool PSPFilesystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/psp/psp-fs.h b/backends/fs/psp/psp-fs.h index 648544650b..47c6d04a70 100644 --- a/backends/fs/psp/psp-fs.h +++ b/backends/fs/psp/psp-fs.h @@ -65,7 +65,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); }; #endif diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index e4163caa33..c6d5cc4955 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -232,7 +232,7 @@ Common::WriteStream *SymbianFilesystemNode::createWriteStream() { return SymbianStdioStream::makeFromPath(getPath(), true); } -bool SymbianFilesystemNode::create(bool isDirectory) { +bool SymbianFilesystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/symbian/symbian-fs.h b/backends/fs/symbian/symbian-fs.h index 1327f9f2e9..0f8212035f 100644 --- a/backends/fs/symbian/symbian-fs.h +++ b/backends/fs/symbian/symbian-fs.h @@ -66,7 +66,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); }; #endif |