[Scummvm-cvs-logs] CVS: scummvm/backends/fs fs.cpp,1.1,1.2 fs.h,1.22,1.23

Max Horn fingolfin at users.sourceforge.net
Sun Nov 21 05:26:20 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12610

Modified Files:
	fs.cpp fs.h 
Log Message:
Since we do ref counting on the nodes now, we can re-use the root nodes now

Index: fs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/fs.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fs.cpp	20 Nov 2004 21:35:48 -0000	1.1
+++ fs.cpp	21 Nov 2004 13:18:06 -0000	1.2
@@ -72,7 +72,10 @@
 }
 
 FilesystemNode FilesystemNode::getParent() const {
-	FilesystemNode wrapper;
-	wrapper._realNode = _realNode->parent();
-	return wrapper;
+	AbstractFilesystemNode *node = _realNode->parent();
+	if (node == 0)
+		return *this;
+	else {
+		return AbstractFilesystemNode::wrap(node);
+	}
 }

Index: fs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/fs.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- fs.h	20 Nov 2004 21:35:48 -0000	1.22
+++ fs.h	21 Nov 2004 13:18:06 -0000	1.23
@@ -139,6 +139,17 @@
 	{
 		return scumm_stricmp(displayName().c_str(), node.displayName().c_str()) < 0;
 	}
+
+
+	/* TODO:
+	bool exists();
+
+	bool isDirectory();
+	bool isFile();
+
+	bool isReadable();
+	bool isWriteable();
+	*/
 };
 
 class FilesystemNode : public AbstractFilesystemNode {





More information about the Scummvm-git-logs mailing list