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

[tanoku at users.sourceforge.net]

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

Log Message:
-----------
Fixed functionality of ZipArchive::getAllNames(). Now it expects a possibly non-empty string list and returns the amount of new filenames added to it.

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

Modified: scummvm/trunk/common/unzip.cpp
===================================================================
--- scummvm/trunk/common/unzip.cpp	2008-09-30 11:33:43 UTC (rev 34697)
+++ scummvm/trunk/common/unzip.cpp	2008-09-30 11:53:37 UTC (rev 34698)
@@ -1400,14 +1400,15 @@
 		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.