From 87917e06d94e36c483011deaf1eb4a5dba6eeb97 Mon Sep 17 00:00:00 2001
From: Vicent Marti
Date: Tue, 30 Sep 2008 11:53:37 +0000
Subject: Fixed functionality of ZipArchive::getAllNames(). Now it expects a
 possibly non-empty string list and returns the amount of new filenames added
 to it.

svn-id: r34698
---
 common/unzip.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/unzip.cpp b/common/unzip.cpp
index 775a6e2dab..24744203da 100644
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@@ -1400,14 +1400,15 @@ int ZipArchive::getAllNames(Common::StringList &list) {
 		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;
 }
 
 /*
-- 
cgit v1.2.3