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

[kirben at users.sourceforge.net]

Revision: 22194
Author:   kirben
Date:     2006-04-27 16:14:54 -0700 (Thu, 27 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22194&view=rev

Log Message:
-----------
Revert kListAllNoRoot addition to listdir(), the uninitialized _isPseudoRoot in windows filesys backend was real cause of problem.

Modified Paths:
--------------
    scummvm/trunk/backends/fs/fs.h
    scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
    scummvm/trunk/backends/fs/windows/windows-fs.cpp
    scummvm/trunk/common/file.cpp
Modified: scummvm/trunk/backends/fs/fs.h
===================================================================
--- scummvm/trunk/backends/fs/fs.h	2006-04-27 19:55:09 UTC (rev 22193)
+++ scummvm/trunk/backends/fs/fs.h	2006-04-27 23:14:54 UTC (rev 22194)
@@ -98,8 +98,7 @@
 	typedef enum {
 		kListFilesOnly = 1,
 		kListDirectoriesOnly = 2,
-		kListAllNoRoot = 3,
-		kListAll = 4
+		kListAll = 3
 	} ListMode;
 
 	virtual ~AbstractFilesystemNode() {}

Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp	2006-04-27 19:55:09 UTC (rev 22193)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp	2006-04-27 23:14:54 UTC (rev 22194)
@@ -103,7 +103,7 @@
 	assert(_isDirectory);
 	FSList myList;
 
-	if (_isPseudoRoot && mode != kListAllNoRoot) {
+	if (_isPseudoRoot) {
 		// Drives enumeration
 		RFs fs = CEikonEnv::Static()->FsSession();
 		TInt driveNumber;

Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-04-27 19:55:09 UTC (rev 22193)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-04-27 23:14:54 UTC (rev 22194)
@@ -169,7 +169,7 @@
 
 	FSList myList;
 
-	if (_isPseudoRoot && mode != kListAllNoRoot) {
+	if (_isPseudoRoot) {
 #ifndef _WIN32_WCE
 		// Drives enumeration
 		TCHAR drive_buffer[100];

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2006-04-27 19:55:09 UTC (rev 22193)
+++ scummvm/trunk/common/file.cpp	2006-04-27 23:14:54 UTC (rev 22194)
@@ -133,7 +133,7 @@
 	if (!_filesMap)
 		_filesMap = new FilesMap;
 
-	const FSList fslist(dir.listDir(FilesystemNode::kListAllNoRoot));
+	const FSList fslist(dir.listDir(FilesystemNode::kListAll));
 	
 	for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
 		if (file->isDirectory()) {


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