diff options
| author | Max Kellermann <max@duempel.org> | 2013-09-05 00:06:31 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-05 00:23:14 +0200 |
| commit | 7d0269d2cec68c7e55df5b6db3d2266741534b17 (patch) | |
| tree | 613f5d7b03bc9624f15167c76f8f4309603944cc /src/archive | |
| parent | 52ffdb0a55e43153fa9fc1189316884a630df700 (diff) | |
| download | mpd-7d0269d2cec68c7e55df5b6db3d2266741534b17.tar.gz mpd-7d0269d2cec68c7e55df5b6db3d2266741534b17.tar.xz mpd-7d0269d2cec68c7e55df5b6db3d2266741534b17.zip | |
InputLegacy: move functions to the input_stream class
Diffstat (limited to 'src/archive')
| -rw-r--r-- | src/archive/Bzip2ArchivePlugin.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
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; |