From 13f6b4ab21b1cc6e7b976f9997f2cc2687d977b1 Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 29 May 2013 14:42:29 +0300 Subject: Minor code style fix. Correct close guard place. --- coding/zip_reader.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'coding/zip_reader.cpp') diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp index cb123cac2a..843d9ef8b5 100644 --- a/coding/zip_reader.cpp +++ b/coding/zip_reader.cpp @@ -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 buf(BUF_SIZE); // First outFile should be closed, then FileWriter::DeleteFileX is called, -- cgit v1.2.3