oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

archive/bzip2: fold Open() into constructor

Browse Source
This commit is contained in:
Max Kellermann 2020-09-04 17:50:39 +02:00
parent f63c343f68
commit 15939fd87c
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/archive/plugins/Bzip2ArchivePlugin.cxx
View File

@ -79,25 +79,6 @@ private:
bool FillBuffer(); bool FillBuffer();
}; };
/* single archive handling allocation helpers */
inline void
Bzip2InputStream::Open()
{
bzstream.bzalloc = nullptr;
bzstream.bzfree = nullptr;
bzstream.opaque = nullptr;
bzstream.next_in = (char *)buffer;
bzstream.avail_in = 0;
int ret = BZ2_bzDecompressInit(&bzstream, 0, 0);
if (ret != BZ_OK)
throw std::runtime_error("BZ2_bzDecompressInit() has failed");
SetReady();
}
/* archive open && listing routine */ /* archive open && listing routine */
static std::unique_ptr<ArchiveFile> static std::unique_ptr<ArchiveFile>
@ -116,7 +97,18 @@ Bzip2InputStream::Bzip2InputStream(const std::shared_ptr<InputStream> &_input,
:InputStream(_uri, _mutex), :InputStream(_uri, _mutex),
input(_input) input(_input)
{ {
Open(); bzstream.bzalloc = nullptr;
bzstream.bzfree = nullptr;
bzstream.opaque = nullptr;
bzstream.next_in = (char *)buffer;
bzstream.avail_in = 0;
int ret = BZ2_bzDecompressInit(&bzstream, 0, 0);
if (ret != BZ_OK)
throw std::runtime_error("BZ2_bzDecompressInit() has failed");
SetReady();
} }
Bzip2InputStream::~Bzip2InputStream() noexcept Bzip2InputStream::~Bzip2InputStream() noexcept