[Scummvm-cvs-logs] SF.net SVN: scummvm:[52127] scummvm/trunk/common/fs.cpp

[sev at users.sourceforge.net]

Revision: 52127
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52127&view=rev
Author:   sev
Date:     2010-08-16 18:07:21 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
OSYSTEM: revert r52120 and r52121. Introduced regressions

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

Modified: scummvm/trunk/common/fs.cpp
===================================================================
--- scummvm/trunk/common/fs.cpp	2010-08-16 17:02:35 UTC (rev 52126)
+++ scummvm/trunk/common/fs.cpp	2010-08-16 18:07:21 UTC (rev 52127)
@@ -314,27 +314,10 @@
 	NodeCache::iterator it = _fileCache.begin();
 	for ( ; it != _fileCache.end(); ++it) {
 		if (it->_key.matchString(lowercasePattern, false, true)) {
-			if (_flat)
-				list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
-			else
-				list.push_back(ArchiveMemberPtr(new FSNode(it->_key)));
-
+			list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
 			matches++;
 		}
 	}
-
-	// If non-flat directory was created, include directories in the match too
-	if (!_flat) {
-		it = _subDirCache.begin();
-		for ( ; it != _subDirCache.end(); ++it) {
-			if (it->_key.matchString(lowercasePattern, false, true)) {
-				list.push_back(ArchiveMemberPtr(new FSNode(it->_key + "/")));
-
-				matches++;
-			}
-		}
-	}
-
 	return matches;
 }
 
@@ -347,23 +330,10 @@
 
 	int files = 0;
 	for (NodeCache::iterator it = _fileCache.begin(); it != _fileCache.end(); ++it) {
-		if (_flat)
-			list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
-		else
-			list.push_back(ArchiveMemberPtr(new FSNode(it->_key)));
-
+		list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
 		++files;
 	}
 
-	// If non-flat directory was created, include directories in the list too
-	if (!_flat) {
-		for (NodeCache::iterator it = _subDirCache.begin(); it != _subDirCache.end(); ++it) {
-			list.push_back(ArchiveMemberPtr(new FSNode(it->_key + "/")));
-
-			++files;
-		}
-	}
-
 	return files;
 }
 


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