From dcf55c7e328578d435eb14277cb6ba9e072f7e9c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 28 Jan 2013 20:32:23 +0100
Subject: InputStream: add constructor/destructor

Eliminate input_stream_init() and input_stream_deinit().
---
 src/archive/ZzipArchivePlugin.cxx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/archive/ZzipArchivePlugin.cxx')

diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx
index 8c4b77987..dabdd41d9 100644
--- a/src/archive/ZzipArchivePlugin.cxx
+++ b/src/archive/ZzipArchivePlugin.cxx
@@ -142,10 +142,8 @@ struct ZzipInputStream {
 	ZzipInputStream(ZzipArchiveFile &_archive, const char *uri,
 			Mutex &mutex, Cond &cond,
 			ZZIP_FILE *_file)
-		:archive(&_archive), file(_file) {
-		input_stream_init(&base, &zzip_input_plugin, uri,
-				  mutex, cond);
-
+		:base(zzip_input_plugin, uri, mutex, cond),
+		 archive(&_archive), file(_file) {
 		base.ready = true;
 		//we are seekable (but its not recommendent to do so)
 		base.seekable = true;
@@ -160,7 +158,6 @@ struct ZzipInputStream {
 	~ZzipInputStream() {
 		zzip_file_close(file);
 		archive->Unref();
-		input_stream_deinit(&base);
 	}
 };
 
-- 
cgit v1.2.3