[Scummvm-cvs-logs] SF.net SVN: scummvm:[34556] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 34556
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34556&view=rev
Author:   fingolfin
Date:     2008-09-15 12:37:18 +0000 (Mon, 15 Sep 2008)

Log Message:
-----------
Corrected and shortened some file opening related warnings

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/common/file.cpp
    scummvm/trunk/common/fs.cpp

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2008-09-15 10:05:36 UTC (rev 34555)
+++ scummvm/trunk/common/archive.cpp	2008-09-15 12:37:18 UTC (rev 34556)
@@ -100,10 +100,10 @@
 	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;
 	}
 

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2008-09-15 10:05:36 UTC (rev 34555)
+++ scummvm/trunk/common/file.cpp	2008-09-15 12:37:18 UTC (rev 34556)
@@ -108,10 +108,10 @@
 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 @@
 	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;
 	}
 

Modified: scummvm/trunk/common/fs.cpp
===================================================================
--- scummvm/trunk/common/fs.cpp	2008-09-15 10:05:36 UTC (rev 34555)
+++ scummvm/trunk/common/fs.cpp	2008-09-15 12:37:18 UTC (rev 34556)
@@ -178,10 +178,10 @@
 		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 @@
 		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;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.