From 7d0269d2cec68c7e55df5b6db3d2266741534b17 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 5 Sep 2013 00:06:31 +0200 Subject: InputLegacy: move functions to the input_stream class --- src/archive/Bzip2ArchivePlugin.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/archive') diff --git a/src/archive/Bzip2ArchivePlugin.cxx b/src/archive/Bzip2ArchivePlugin.cxx index d997158a0..45cdec87c 100644 --- a/src/archive/Bzip2ArchivePlugin.cxx +++ b/src/archive/Bzip2ArchivePlugin.cxx @@ -62,7 +62,7 @@ public: } ~Bzip2ArchiveFile() { - input_stream_close(istream); + istream->Close(); } void Ref() { @@ -155,7 +155,7 @@ bz2_open(const char *pathname, Error &error) { static Mutex mutex; static Cond cond; - input_stream *is = input_stream_open(pathname, mutex, cond, error); + input_stream *is = input_stream::Open(pathname, mutex, cond, error); if (is == nullptr) return nullptr; @@ -211,9 +211,8 @@ bz2_fillbuffer(Bzip2InputStream *bis, Error &error) if (bzstream->avail_in > 0) return true; - count = input_stream_read(bis->archive->istream, - bis->buffer, sizeof(bis->buffer), - error); + count = bis->archive->istream->Read(bis->buffer, sizeof(bis->buffer), + error); if (count == 0) return false; -- cgit v1.2.3