diff --git a/libluna/include/luna/TarStream.h b/libluna/include/luna/TarStream.h index 3bb00ef3..e58a6db2 100644 --- a/libluna/include/luna/TarStream.h +++ b/libluna/include/luna/TarStream.h @@ -1,5 +1,4 @@ #pragma once -#include #include #include #include @@ -26,7 +25,6 @@ class TarStream } private: - usize m_pos; u8* m_data; friend class TarStream; @@ -41,10 +39,6 @@ class TarStream void rewind(); - usize read_contents(const Entry& entry, void* buf, usize offset, usize length) const; - - Result read_contents_as_string(const Entry& entry, usize offset, usize max) const; - private: struct [[gnu::packed]] TarHeader { diff --git a/libluna/src/TarStream.cpp b/libluna/src/TarStream.cpp index 7667b52e..9612798a 100644 --- a/libluna/src/TarStream.cpp +++ b/libluna/src/TarStream.cpp @@ -45,7 +45,6 @@ Result TarStream::parse_header(const TarStream::TarHeader* hdr entry.mode = (mode_t)parse_unsigned_integer(hdr->mode, nullptr, 8); - entry.m_pos = m_offset; entry.m_data = (u8*)m_base + m_offset; switch (hdr->typeflag) @@ -94,24 +93,3 @@ Result TarStream::read_next_entry(Entry& out) return true; } - -usize TarStream::read_contents(const Entry& entry, void* buf, usize offset, usize length) const -{ - if (offset >= entry.size) return 0; - if ((length + offset) > entry.size) length = entry.size - offset; - - memcpy(buf, offset_ptr(m_base, entry.m_pos + offset), length); - - return length; -} - -Result TarStream::read_contents_as_string(const Entry& entry, usize offset, usize max) const -{ - char* const buf = TRY(make_array(max + 1)); - - usize nread = read_contents(entry, buf, offset, max); - - buf[nread] = 0; - - return OwnedStringView { buf }; -}