[Scummvm-cvs-logs] SF.net SVN: scummvm:[54120] scummvm/trunk/engines/advancedDetector.cpp

[fingolfin at users.sourceforge.net]

Revision: 54120
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54120&view=rev
Author:   fingolfin
Date:     2010-11-07 17:16:01 +0000 (Sun, 07 Nov 2010)

Log Message:
-----------
DETECTOR: Don't compute mac resource fork MD5 of a file multiple times

Also add a FIXME regarding the fact that we don't handle the case that a
file is listed as a regular file and as one with resource fork.

Modified Paths:
--------------
    scummvm/trunk/engines/advancedDetector.cpp

Modified: scummvm/trunk/engines/advancedDetector.cpp
===================================================================
--- scummvm/trunk/engines/advancedDetector.cpp	2010-11-07 17:15:46 UTC (rev 54119)
+++ scummvm/trunk/engines/advancedDetector.cpp	2010-11-07 17:16:01 UTC (rev 54120)
@@ -449,6 +449,12 @@
 			Common::String fname = fileDesc->fileName;
 			SizeMD5 tmp;
 
+			if (filesSizeMD5.contains(fname))
+				continue;
+
+			// FIXME/TODO: We don't handle the case that a file is listed as a regular
+			// file and as one with resource fork.
+
 			if (g->flags & ADGF_MACRESFORK) {
 				Common::MacResManager *macResMan = new Common::MacResManager();
 
@@ -462,7 +468,7 @@
 
 				delete macResMan;
 			} else {
-				if (allFiles.contains(fname) && !filesSizeMD5.contains(fname)) {
+				if (allFiles.contains(fname)) {
 					debug(3, "+ %s", fname.c_str());
 
 					Common::File testFile;


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