diff options
Diffstat (limited to 'ArchiveEx/Archive.cpp')
-rw-r--r-- | ArchiveEx/Archive.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ArchiveEx/Archive.cpp b/ArchiveEx/Archive.cpp index 2e3aa52..134404c 100644 --- a/ArchiveEx/Archive.cpp +++ b/ArchiveEx/Archive.cpp @@ -16,13 +16,15 @@ namespace Archive using UniqueFileHandle = std::unique_ptr<std::FILE, decltype(&std::fclose)>; -static constexpr std::size_t DIRECTORY_MARGIN {64}; - - static inline std::size_t BytesToBlocks(std::size_t bytes); static inline std::size_t ConvertPathSeparator(const char* src, char* dest); +static constexpr std::uint32_t VERSION {0x0010}; +static constexpr std::size_t BLOCK_SIZE {1024}; +static constexpr std::size_t DIRECTORY_MARGIN {64}; + + Archive::Archive(const char* p) : path {p}, header {}, @@ -70,13 +72,11 @@ Archive::Expand(const int index, std::uint8_t*& buffer, const bool null_terminat int err = std::fseek(file.get(), sizeof(Header) + entry.offset, SEEK_SET); if (-1 == err) return -1; - std::size_t length = std::fread(compressed.data(), 1, entry.compressed_size, file.get()); + const std::size_t length = std::fread(compressed.data(), 1, entry.compressed_size, file.get()); if (entry.compressed_size != length) return -1; uLongf output_length = entry.original_size + static_cast<uLongf>(null_terminated); - std::unique_ptr<std::uint8_t[]> uncompressed(new std::uint8_t[output_length]); - if (!uncompressed) - return -1; + auto uncompressed = std::make_unique<std::uint8_t[]>(output_length); err = uncompress(uncompressed.get(), &output_length, compressed.data(), entry.compressed_size); if (Z_OK != err) return -1; |