aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2008-09-15 12:37:18 +0000
committerMax Horn2008-09-15 12:37:18 +0000
commit5f2ceea1df3d11969e3828e3fd24cffed7203aea (patch)
tree28fe47ea0f0916a2df269b84ea70e3f4be3b8e2d /common
parent15959faf3ec45dbcc2576957a68b2f71f0057e48 (diff)
downloadscummvm-rg350-5f2ceea1df3d11969e3828e3fd24cffed7203aea.tar.gz
scummvm-rg350-5f2ceea1df3d11969e3828e3fd24cffed7203aea.tar.bz2
scummvm-rg350-5f2ceea1df3d11969e3828e3fd24cffed7203aea.zip
Corrected and shortened some file opening related warnings
svn-id: r34556
Diffstat (limited to 'common')
-rw-r--r--common/archive.cpp4
-rw-r--r--common/file.cpp6
-rw-r--r--common/fs.cpp6
3 files changed, 8 insertions, 8 deletions
diff --git a/common/archive.cpp b/common/archive.cpp
index 934c13551f..6b8357d576 100644
--- a/common/archive.cpp
+++ b/common/archive.cpp
@@ -100,10 +100,10 @@ SeekableReadStream *FSDirectory::openFile(const String &name) {
FilesystemNode node = lookupCache(_fileCache, name);
if (!node.exists()) {
- warning("FSDirectory::openFile: Trying to open a FilesystemNode which does not exist");
+ warning("FSDirectory::openFile: FilesystemNode does not exist");
return 0;
} else if (node.isDirectory()) {
- warning("FSDirectory::openFile: Trying to open a FilesystemNode which is a directory");
+ warning("FSDirectory::openFile: FilesystemNode is a directory");
return 0;
}
diff --git a/common/file.cpp b/common/file.cpp
index 668c97a734..cf396a32cd 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -108,10 +108,10 @@ bool File::open(const String &filename) {
bool File::open(const FilesystemNode &node) {
if (!node.exists()) {
- warning("File::open: Trying to open a FilesystemNode which does not exist");
+ warning("File::open: FilesystemNode does not exist");
return false;
} else if (node.isDirectory()) {
- warning("File::open: Trying to open a FilesystemNode which is a directory");
+ warning("File::open: FilesystemNode is a directory");
return false;
}
@@ -225,7 +225,7 @@ bool DumpFile::open(const FilesystemNode &node) {
assert(!_handle);
if (node.isDirectory()) {
- warning("File::open: Trying to open a FilesystemNode which is a directory");
+ warning("DumpFile::open: FilesystemNode is a directory");
return false;
}
diff --git a/common/fs.cpp b/common/fs.cpp
index bf6d1f5a85..4d31ac09fa 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -178,10 +178,10 @@ Common::SeekableReadStream *FilesystemNode::openForReading() const {
return 0;
if (!_realNode->exists()) {
- warning("File::open: Trying to open a FilesystemNode which does not exist");
+ warning("FilesystemNode::openForReading: FilesystemNode does not exist");
return false;
} else if (_realNode->isDirectory()) {
- warning("File::open: Trying to open a FilesystemNode which is a directory");
+ warning("FilesystemNode::openForReading: FilesystemNode is a directory");
return false;
}
@@ -193,7 +193,7 @@ Common::WriteStream *FilesystemNode::openForWriting() const {
return 0;
if (_realNode->isDirectory()) {
- warning("File::open: Trying to open a FilesystemNode which is a directory");
+ warning("FilesystemNode::openForWriting: FilesystemNode is a directory");
return 0;
}