[Scummvm-cvs-logs] SF.net SVN: scummvm:[34699] scummvm/branches/gsoc2008-gui/common/unzip.cpp

tanoku at users.sourceforge.net tanoku at users.sourceforge.net
Tue Sep 30 13:55:34 CEST 2008


Revision: 34699
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34699&view=rev
Author:   tanoku
Date:     2008-09-30 11:55:32 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
Ported ZipArchive::getAllNames() fix from trunk.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/common/unzip.cpp

Modified: scummvm/branches/gsoc2008-gui/common/unzip.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/common/unzip.cpp	2008-09-30 11:53:37 UTC (rev 34698)
+++ scummvm/branches/gsoc2008-gui/common/unzip.cpp	2008-09-30 11:55:32 UTC (rev 34699)
@@ -1395,19 +1395,20 @@
 int ZipArchive::getAllNames(Common::StringList &list) {
 	if (!_zipFile)
 		return 0;
-		
+
 	if (unzGoToFirstFile(_zipFile) != UNZ_OK)
 		return 0;
 
 	char fileNameBuffer[UNZ_MAXFILENAMEINZIP + 1];
-	list.clear();
-		
+	int fileCount = 0;
+
 	do {
 		unzGetCurrentFileInfo(_zipFile, 0, fileNameBuffer, UNZ_MAXFILENAMEINZIP + 1, 0, 0, 0, 0);
 		list.push_back(Common::String(fileNameBuffer));
+		fileCount++;
 	} while (unzGoToNextFile(_zipFile) == UNZ_OK);
-	
-	return list.size();
+
+	return fileCount;
 }
 
 /*


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




More information about the Scummvm-git-logs mailing list