3 files changed, 28 insertions, 28 deletions

diff --git a/src/archive/Bzip2ArchivePlugin.cxx b/src/archive/Bzip2ArchivePlugin.cxx
index c6bd7c40b..d1e6b51af 100644
--- a/src/archive/Bzip2ArchivePlugin.cxx
+++ b/src/archive/Bzip2ArchivePlugin.cxx
@@ -49,9 +49,9 @@ public:
 	RefCount ref;
 
 	std::string name;
-	struct input_stream *const istream;
+	InputStream *const istream;
 
-	Bzip2ArchiveFile(const char *path, input_stream *_is)
+	Bzip2ArchiveFile(const char *path, InputStream *_is)
 		:ArchiveFile(bz2_archive_plugin),
 		 name(PathTraits::GetBaseUTF8(path)),
 		 istream(_is) {
@@ -84,13 +84,13 @@ public:
 		visitor.VisitArchiveEntry(name.c_str());
 	}
 
-	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;
 };
 
 struct Bzip2InputStream {
-	struct input_stream base;
+	InputStream base;
 
 	Bzip2ArchiveFile *archive;
 
@@ -148,7 +148,7 @@ bz2_open(const char *pathname, Error &error)
 {
 	static Mutex mutex;
 	static Cond cond;
-	input_stream *is = input_stream::Open(pathname, mutex, cond, error);
+	InputStream *is = InputStream::Open(pathname, mutex, cond, error);
 	if (is == nullptr)
 		return nullptr;
 
@@ -170,7 +170,7 @@ Bzip2InputStream::~Bzip2InputStream()
 	archive->Unref();
 }
 
-input_stream *
+InputStream *
 Bzip2ArchiveFile::OpenStream(const char *path,
 			     Mutex &mutex, Cond &cond,
 			     Error &error)
@@ -185,7 +185,7 @@ Bzip2ArchiveFile::OpenStream(const char *path,
 }
 
 static void
-bz2_is_close(struct input_stream *is)
+bz2_is_close(InputStream *is)
 {
 	Bzip2InputStream *bis = (Bzip2InputStream *)is;
 
@@ -215,7 +215,7 @@ bz2_fillbuffer(Bzip2InputStream *bis, Error &error)
 }
 
 static size_t
-bz2_is_read(struct input_stream *is, void *ptr, size_t length,
+bz2_is_read(InputStream *is, void *ptr, size_t length,
 	    Error &error)
 {
 	Bzip2InputStream *bis = (Bzip2InputStream *)is;
@@ -255,7 +255,7 @@ bz2_is_read(struct input_stream *is, void *ptr, size_t length,
 }
 
 static bool
-bz2_is_eof(struct input_stream *is)
+bz2_is_eof(InputStream *is)
 {
 	Bzip2InputStream *bis = (Bzip2InputStream *)is;
 
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;
 }
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;