RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Minor code style fix. Correct close guard place.

Browse source
This commit is contained in:
vng 2013-05-29 14:42:29 +03:00 • committed by Alex Zolotarev
parent 50393615dd
commit 13f6b4ab21
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
coding/zip_reader.cpp
View file

@ -23,10 +23,10 @@ ZipFileReader::ZipFileReader(string const & container, string const & file)
MYTHROW(LocateZipException, ("Can't locate file inside zip", file));
if (UNZ_OK != unzOpenCurrentFile(zip))
MYTHROW(LocateZipException, ("Can't open file inside zip", file));
MYTHROW(LocateZipException, ("Can't open file inside zip", file));
uint64_t offset = unzGetCurrentFileZStreamPos64(zip);
unzCloseCurrentFile(zip);
uint64_t const offset = unzGetCurrentFileZStreamPos64(zip);
(void) unzCloseCurrentFile(zip);
if (offset > Size())
MYTHROW(LocateZipException, ("Invalid offset inside zip", file));
@ -82,15 +82,14 @@ void ZipFileReader::UnzipFile(string const & zipContainer, string const & fileIn
MYTHROW(LocateZipException, ("Can't locate file inside zip", fileInZip));
if (UNZ_OK != unzOpenCurrentFile(zip))
MYTHROW(LocateZipException, ("Can't open file inside zip", fileInZip));
MYTHROW(LocateZipException, ("Can't open file inside zip", fileInZip));
MY_SCOPE_GUARD(currentFileGuard, bind(&unzCloseCurrentFile, zip));
unz_file_info64 fileInfo;
if (UNZ_OK != unzGetCurrentFileInfo64(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0))
MYTHROW(LocateZipException, ("Can't get uncompressed file size inside zip", fileInZip));
MY_SCOPE_GUARD(currentFileGuard, bind(&unzCloseCurrentFile, zip));
static size_t const BUF_SIZE = 1024 * 50;
size_t const BUF_SIZE = 1024 * 50;
vector<char> buf(BUF_SIZE);
// First outFile should be closed, then FileWriter::DeleteFileX is called,