diff options
| -rw-r--r-- | 3party/minizip/minizip.cpp | 6 | ||||
| -rw-r--r-- | 3party/minizip/minizip.hpp | 8 | ||||
| -rw-r--r-- | coding/zip_reader.cpp | 8 | ||||
| -rw-r--r-- | generator/srtm_parser.cpp | 1 |
4 files changed, 11 insertions, 12 deletions
diff --git a/3party/minizip/minizip.cpp b/3party/minizip/minizip.cpp index 82ef6d5488..f52dce8cec 100644 --- a/3party/minizip/minizip.cpp +++ b/3party/minizip/minizip.cpp @@ -12,17 +12,17 @@ Code Close(File file) return static_cast<Code>(unzClose(file)); } -Code SeekToFirstFile(File file) +Code GoToFirstFile(File file) { return static_cast<Code>(unzGoToFirstFile(file)); } -Code SeekToNextFile(File file) +Code GoToNextFile(File file) { return static_cast<Code>(unzGoToNextFile(file)); } -Code SeekToFile(File file, std::string const & filename) +Code GoToFile(File file, std::string const & filename) { return static_cast<Code>(unzLocateFile(file, filename.c_str(), 1 /* iCaseSensitivity */)); } diff --git a/3party/minizip/minizip.hpp b/3party/minizip/minizip.hpp index 431c96d26e..7d5532f964 100644 --- a/3party/minizip/minizip.hpp +++ b/3party/minizip/minizip.hpp @@ -27,7 +27,7 @@ enum class Code : int8_t Ok = UNZ_OK, EndOfListOfFile = UNZ_END_OF_LIST_OF_FILE, ErrNo = UNZ_ERRNO, - Eof = UNZ_OK, + Eof = UNZ_EOF, ParamError = UNZ_PARAMERROR, BadZipFile = UNZ_BADZIPFILE, InternalError = UNZ_INTERNALERROR, @@ -38,11 +38,11 @@ File Open(std::string const & filename); Code Close(File file); -Code SeekToFirstFile(File file); +Code GoToFirstFile(File file); -Code SeekToNextFile(File file); +Code GoToNextFile(File file); -Code SeekToFile(File file, std::string const & filename); +Code GoToFile(File file, std::string const & filename); Code OpenCurrentFile(File file); diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp index 35441d1e0d..c3d26cee3b 100644 --- a/coding/zip_reader.cpp +++ b/coding/zip_reader.cpp @@ -52,7 +52,7 @@ ZipFileReader::ZipFileReader(string const & container, string const & file, uint SCOPE_GUARD(zipGuard, bind(&unzClose, zip)); - if (unzip::Code::Ok != unzip::SeekToFile(zip, file.c_str())) + if (unzip::Code::Ok != unzip::GoToFile(zip, file.c_str())) MYTHROW(LocateZipException, ("Can't locate file inside zip", file)); if (unzip::Code::Ok != unzip::OpenCurrentFile(zip)) @@ -80,7 +80,7 @@ void ZipFileReader::FilesList(string const & zipContainer, FileList & filesList) SCOPE_GUARD(zipGuard, bind(&unzip::Close, zip)); - if (unzip::Code::Ok != unzip::SeekToFirstFile(zip)) + if (unzip::Code::Ok != unzip::GoToFirstFile(zip)) MYTHROW(LocateZipException, ("Can't find first file inside zip", zipContainer)); do @@ -91,7 +91,7 @@ void ZipFileReader::FilesList(string const & zipContainer, FileList & filesList) filesList.push_back(make_pair(fileInfo.m_filename, fileInfo.m_info.uncompressed_size)); - } while (unzip::Code::Ok == unzip::SeekToNextFile(zip)); + } while (unzip::Code::Ok == unzip::GoToNextFile(zip)); } bool ZipFileReader::IsZip(string const & zipContainer) @@ -112,7 +112,7 @@ void ZipFileReader::UnzipFile(string const & zipContainer, string const & fileIn MYTHROW(OpenZipException, ("Can't get zip file handle", zipContainer)); SCOPE_GUARD(zipGuard, bind(&unzip::Close, zip)); - if (unzip::Code::Ok != unzip::SeekToFile(zip, fileInZip)) + if (unzip::Code::Ok != unzip::GoToFile(zip, fileInZip)) MYTHROW(LocateZipException, ("Can't locate file inside zip", fileInZip)); if (unzip::Code::Ok != unzip::OpenCurrentFile(zip)) diff --git a/generator/srtm_parser.cpp b/generator/srtm_parser.cpp index d26a0e19d8..2b71cbf3b2 100644 --- a/generator/srtm_parser.cpp +++ b/generator/srtm_parser.cpp @@ -8,7 +8,6 @@ #include <iomanip> #include <sstream> -#include <vector> namespace generator { |