[Scummvm-cvs-logs] SF.net SVN: scummvm: [21600] scummvm/trunk/backends/fs/posix

[fingolfin at users.sourceforge.net]

Revision: 21600
Author:   fingolfin
Date:     2006-04-04 14:03:17 -0700 (Tue, 04 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21600&view=rev

Log Message:
-----------
Some more FS code cleanup

Modified Paths:
--------------
    scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
    scummvm/trunk/backends/fs/posix/posix-fs.cpp
    scummvm/trunk/backends/fs/windows/windows-fs.cpp
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs.cpp	2006-04-04 21:02:44 UTC (rev 21599)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs.cpp	2006-04-04 21:03:17 UTC (rev 21600)
@@ -62,7 +62,7 @@
 		--cur;
 	}
 
-	return cur+1;
+	return cur + 1;
 }
 
 void PalmOSFilesystemNode::addFile(FSList &list, ListMode mode, const char *base, FileInfoType* find_data) {

Modified: scummvm/trunk/backends/fs/posix/posix-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/posix/posix-fs.cpp	2006-04-04 21:02:44 UTC (rev 21599)
+++ scummvm/trunk/backends/fs/posix/posix-fs.cpp	2006-04-04 21:03:17 UTC (rev 21600)
@@ -69,7 +69,7 @@
 		--cur;
 	}
 
-	return cur+1;
+	return cur + 1;
 }
 
 AbstractFilesystemNode *FilesystemNode::getRoot() {

Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-04-04 21:02:44 UTC (rev 21599)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-04-04 21:03:17 UTC (rev 21600)
@@ -145,20 +145,11 @@
 WindowsFilesystemNode::WindowsFilesystemNode(const String &p) {
 	int len = 0, offset = p.size();
 
-	assert(offset > 0);
+	assert(p.size() > 0);
 
 	_path = p;
+	_displayName = lastPathComponent(_path);
 
-	// Extract last component from path
-	const char *str = p.c_str();
-	while (offset > 0 && str[offset-1] == '\\')
-		offset--;
-	while (offset > 0 && str[offset-1] != '\\') {
-		len++;
-		offset--;
-	}
-	_displayName = String(str + offset, len);
-
 	// Check whether it is a directory, and whether the file actually exists
 	DWORD fileAttribs = GetFileAttributes(toUnicode(_path.c_str()));
 


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