diff options
author | vng <viktor.govako@gmail.com> | 2012-06-13 12:11:45 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:39:46 +0300 |
commit | f317b438633b2d123e4d7f8215ce652a6d98a52c (patch) | |
tree | 629691b78fcfc8c9515098820d8c788a702b68f0 /coding | |
parent | 6db85bfa17869e85d34553e59f1ccedb0bc4b5e6 (diff) |
Fix bug with font's names getting in Platform.
Diffstat (limited to 'coding')
-rw-r--r-- | coding/zip_reader.cpp | 7 | ||||
-rw-r--r-- | coding/zip_reader.hpp | 6 |
2 files changed, 6 insertions, 7 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) diff --git a/coding/zip_reader.hpp b/coding/zip_reader.hpp index 02a3fb6124..b00e7fcad0 100644 --- a/coding/zip_reader.hpp +++ b/coding/zip_reader.hpp @@ -13,14 +13,15 @@ #include "../std/function.hpp" + class ZipFileReader : public BaseZipFileReaderType { private: uint64_t m_uncompressedFileSize; public: - typedef function<void(int, int)> ProgressFn; + typedef vector<string> FileListT; DECLARE_EXCEPTION(OpenZipException, OpenException); DECLARE_EXCEPTION(LocateZipException, OpenException); @@ -35,7 +36,8 @@ public: static void UnzipFile(string const & zipContainer, string const & fileInZip, string const & outFilePath, ProgressFn progressFn = ProgressFn()); - static vector<string> FilesList(string const & zipContainer); + static void FilesList(string const & zipContainer, FileListT & filesList); + /// Quick version without exceptions static bool IsZip(string const & zipContainer); }; |