From 4b1ca08f26152fbcfb5eb838d271fdd88c381eca Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 2 Mar 2017 04:28:19 +0300 Subject: Add base class for VirtDirEntry and VirtZipEntry. --- src/fs/virtfs/zip.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/fs/virtfs/zip.cpp') diff --git a/src/fs/virtfs/zip.cpp b/src/fs/virtfs/zip.cpp index b1bc45439..3a4e349dc 100644 --- a/src/fs/virtfs/zip.cpp +++ b/src/fs/virtfs/zip.cpp @@ -57,7 +57,7 @@ namespace Zip reportAlways("Entry is null."); return false; } - const std::string archiveName = entry->mArchiveName; + const std::string archiveName = entry->root; std::vector &restrict headers = entry->mHeaders; std::vector &restrict dirs = entry->mDirs; FILE *restrict const arcFile = fopen(archiveName.c_str(), @@ -215,12 +215,12 @@ namespace Zip return nullptr; } FILE *restrict const arcFile = fopen( - header->zipEntry->mArchiveName.c_str(), + header->zipEntry->root.c_str(), "r"); if (arcFile == nullptr) { reportAlways("Can't open zip file %s", - header->zipEntry->mArchiveName.c_str()); + header->zipEntry->root.c_str()); return nullptr; } @@ -231,7 +231,7 @@ namespace Zip compressSize) { reportAlways("Read zip compressed file error from archive: %s", - header->zipEntry->mArchiveName.c_str()); + header->zipEntry->root.c_str()); fclose(arcFile); delete [] buf; return nullptr; @@ -269,7 +269,7 @@ namespace Zip int ret = inflateInit2(&strm, -MAX_WBITS); if (ret != Z_OK) { - reportZlibError(header->zipEntry->mArchiveName, ret); + reportZlibError(header->zipEntry->root, ret); delete [] in; delete [] out; return nullptr; -- cgit v1.2.3-60-g2f50