diff options
author | Max Kellermann <max@duempel.org> | 2013-10-23 22:08:59 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-10-23 23:12:02 +0200 |
commit | 93deb844996120b6326345d6d87e803142dd1968 (patch) | |
tree | d6c00669efffad1b15fc45e03158d6838a7e5827 /src/archive/ZzipArchivePlugin.cxx | |
parent | c4d4011c63808a64ca20a4b03fd455a83c23cc33 (diff) | |
download | mpd-93deb844996120b6326345d6d87e803142dd1968.tar.gz mpd-93deb844996120b6326345d6d87e803142dd1968.tar.xz mpd-93deb844996120b6326345d6d87e803142dd1968.zip |
input_stream: rename struct to InputStream
Diffstat (limited to '')
-rw-r--r-- | src/archive/ZzipArchivePlugin.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx index ee2f2e76a..973fe91dc 100644 --- a/src/archive/ZzipArchivePlugin.cxx +++ b/src/archive/ZzipArchivePlugin.cxx @@ -60,9 +60,9 @@ public: virtual void Visit(ArchiveVisitor &visitor) override; - virtual input_stream *OpenStream(const char *path, - Mutex &mutex, Cond &cond, - Error &error) override; + virtual InputStream *OpenStream(const char *path, + Mutex &mutex, Cond &cond, + Error &error) override; }; extern const InputPlugin zzip_input_plugin; @@ -99,7 +99,7 @@ ZzipArchiveFile::Visit(ArchiveVisitor &visitor) /* single archive handling */ struct ZzipInputStream { - struct input_stream base; + InputStream base; ZzipArchiveFile *archive; @@ -127,7 +127,7 @@ struct ZzipInputStream { } }; -input_stream * +InputStream * ZzipArchiveFile::OpenStream(const char *pathname, Mutex &mutex, Cond &cond, Error &error) @@ -147,7 +147,7 @@ ZzipArchiveFile::OpenStream(const char *pathname, } static void -zzip_input_close(struct input_stream *is) +zzip_input_close(InputStream *is) { ZzipInputStream *zis = (ZzipInputStream *)is; @@ -155,7 +155,7 @@ zzip_input_close(struct input_stream *is) } static size_t -zzip_input_read(struct input_stream *is, void *ptr, size_t size, +zzip_input_read(InputStream *is, void *ptr, size_t size, Error &error) { ZzipInputStream *zis = (ZzipInputStream *)is; @@ -173,7 +173,7 @@ zzip_input_read(struct input_stream *is, void *ptr, size_t size, } static bool -zzip_input_eof(struct input_stream *is) +zzip_input_eof(InputStream *is) { ZzipInputStream *zis = (ZzipInputStream *)is; @@ -181,7 +181,7 @@ zzip_input_eof(struct input_stream *is) } static bool -zzip_input_seek(struct input_stream *is, InputPlugin::offset_type offset, +zzip_input_seek(InputStream *is, InputPlugin::offset_type offset, int whence, Error &error) { ZzipInputStream *zis = (ZzipInputStream *)is; |