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/Iso9660ArchivePlugin.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 'src/archive/Iso9660ArchivePlugin.cxx')
-rw-r--r-- | src/archive/Iso9660ArchivePlugin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/Iso9660ArchivePlugin.cxx index 729efb589..8233d03f7 100644 --- a/src/archive/Iso9660ArchivePlugin.cxx +++ b/src/archive/Iso9660ArchivePlugin.cxx @@ -66,9 +66,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 iso9660_input_plugin; @@ -132,7 +132,7 @@ Iso9660ArchiveFile::Visit(ArchiveVisitor &visitor) /* single archive handling */ struct Iso9660InputStream { - struct input_stream base; + InputStream base; Iso9660ArchiveFile *archive; @@ -158,7 +158,7 @@ struct Iso9660InputStream { } }; -input_stream * +InputStream * Iso9660ArchiveFile::OpenStream(const char *pathname, Mutex &mutex, Cond &cond, Error &error) @@ -177,7 +177,7 @@ Iso9660ArchiveFile::OpenStream(const char *pathname, } static void -iso9660_input_close(struct input_stream *is) +iso9660_input_close(InputStream *is) { Iso9660InputStream *iis = (Iso9660InputStream *)is; @@ -186,7 +186,7 @@ iso9660_input_close(struct input_stream *is) static size_t -iso9660_input_read(struct input_stream *is, void *ptr, size_t size, +iso9660_input_read(InputStream *is, void *ptr, size_t size, Error &error) { Iso9660InputStream *iis = (Iso9660InputStream *)is; @@ -226,7 +226,7 @@ iso9660_input_read(struct input_stream *is, void *ptr, size_t size, } static bool -iso9660_input_eof(struct input_stream *is) +iso9660_input_eof(InputStream *is) { return is->offset == is->size; } |