From a88cfc3a560f372f5abcff09fcbf8393c1f0bd55 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 9 Aug 2022 22:52:49 +0200 Subject: Cleaned-up selected parts of newly added code --- ArchiveEx/Archive.cpp | 14 +++++++------- ArchiveEx/Archive.h | 2 -- 2 files changed, 7 insertions(+), 9 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; -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(null_terminated); - std::unique_ptr uncompressed(new std::uint8_t[output_length]); - if (!uncompressed) - return -1; + auto uncompressed = std::make_unique(output_length); err = uncompress(uncompressed.get(), &output_length, compressed.data(), entry.compressed_size); if (Z_OK != err) return -1; diff --git a/ArchiveEx/Archive.h b/ArchiveEx/Archive.h index 0f1be0c..cbaf571 100644 --- a/ArchiveEx/Archive.h +++ b/ArchiveEx/Archive.h @@ -9,8 +9,6 @@ namespace Archive { -static constexpr std::uint32_t VERSION {0x0010}; -static constexpr std::size_t BLOCK_SIZE {1024}; static constexpr std::size_t NAMELEN {64}; -- cgit v1.1