From db25352b19f77fc975816435b67b477441517476 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 11 Aug 2022 23:10:35 +0200 Subject: Renamed Insertion and Extraction methods --- ArchiveEx/Archive.cpp | 8 ++++---- ArchiveEx/Archive.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ArchiveEx/Archive.cpp b/ArchiveEx/Archive.cpp index 513d161..6d06a1f 100644 --- a/ArchiveEx/Archive.cpp +++ b/ArchiveEx/Archive.cpp @@ -62,7 +62,7 @@ Archive::Archive(const char* p) : int -Archive::Expand(const int index, std::uint8_t*& buffer, const bool null_terminated) const +Archive::Extract(const int index, std::uint8_t*& buffer, const bool null_terminated) const { if (0 > index && static_cast(header.total_entries) <= index) return -1; // Can be replaced by error-checked access to std::vector holding entries. @@ -90,12 +90,12 @@ Archive::Expand(const int index, std::uint8_t*& buffer, const bool null_terminat int -Archive::Expand(const char* filepath, std::uint8_t*& buffer, const bool null_terminated) const +Archive::Extract(const char* filepath, std::uint8_t*& buffer, const bool null_terminated) const { const int index = Find(filepath); if (-1 == index) return -1; - return Expand(index, buffer, null_terminated); + return Extract(index, buffer, null_terminated); } @@ -113,7 +113,7 @@ Archive::Find(const char* filepath) const int -Archive::Update(const char* filepath) +Archive::Insert(const char* filepath) { const std::size_t namelen = std::strlen(filepath); if (NAMELEN <= namelen) diff --git a/ArchiveEx/Archive.h b/ArchiveEx/Archive.h index 5330aea..e9a49c5 100644 --- a/ArchiveEx/Archive.h +++ b/ArchiveEx/Archive.h @@ -37,10 +37,10 @@ class Archive { public: explicit Archive(const char* path); - int Expand(int index, std::uint8_t*& buffer, bool null_terminated=false) const; - int Expand(const char* filepath, std::uint8_t*& buffer, bool null_terminated=false) const; + int Extract(int index, std::uint8_t*& buffer, bool null_terminated=false) const; + int Extract(const char* filepath, std::uint8_t*& buffer, bool null_terminated=false) const; int Find(const char* filepath) const; - int Update(const char* filepath); + int Insert(const char* filepath); void WriteMeta(); void UpdateBlockMap(); std::size_t FindFreeSpot(std::size_t bytes) const; -- cgit v1.1