Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2012-06-13 12:11:45 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:39:46 +0300
commitf317b438633b2d123e4d7f8215ce652a6d98a52c (patch)
tree629691b78fcfc8c9515098820d8c788a702b68f0 /coding/zip_reader.cpp
parent6db85bfa17869e85d34553e59f1ccedb0bc4b5e6 (diff)
Fix bug with font's names getting in Platform.
Diffstat (limited to 'coding/zip_reader.cpp')
-rw-r--r--coding/zip_reader.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp
index 37765e4463..4eed5c536f 100644
--- a/coding/zip_reader.cpp
+++ b/coding/zip_reader.cpp
@@ -38,9 +38,9 @@ ZipFileReader::ZipFileReader(string const & container, string const & file)
m_uncompressedFileSize = fileInfo.uncompressed_size;
}
-vector<string> ZipFileReader::FilesList(string const & zipContainer)
+void ZipFileReader::FilesList(string const & zipContainer, FileListT & filesList)
{
- unzFile zip = unzOpen64(zipContainer.c_str());
+ unzFile const zip = unzOpen64(zipContainer.c_str());
if (!zip)
MYTHROW(OpenZipException, ("Can't get zip file handle", zipContainer));
@@ -49,7 +49,6 @@ vector<string> ZipFileReader::FilesList(string const & zipContainer)
if (UNZ_OK != unzGoToFirstFile(zip))
MYTHROW(LocateZipException, ("Can't find first file inside zip", zipContainer));
- vector<string> filesList;
do
{
char fileName[256];
@@ -59,8 +58,6 @@ vector<string> ZipFileReader::FilesList(string const & zipContainer)
filesList.push_back(fileName);
} while (UNZ_OK == unzGoToNextFile(zip));
-
- return filesList;
}
bool ZipFileReader::IsZip(string const & zipContainer)