InputStream: add constructor/destructor

Eliminate input_stream_init() and input_stream_deinit().
This commit is contained in:
Max Kellermann
2013-01-28 20:32:23 +01:00
parent e565cd4404
commit dcf55c7e32
14 changed files with 40 additions and 91 deletions

View File

@@ -184,16 +184,15 @@ bz2_close(struct archive_file *file)
Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context, const char *uri,
Mutex &mutex, Cond &cond)
:archive(&_context), eof(false)
:base(bz2_inputplugin, uri, mutex, cond),
archive(&_context), eof(false)
{
input_stream_init(&base, &bz2_inputplugin, uri, mutex, cond);
refcount_inc(&archive->ref);
}
Bzip2InputStream::~Bzip2InputStream()
{
bz2_close(&archive->base);
input_stream_deinit(&base);
}
static struct input_stream *

View File

@@ -178,10 +178,9 @@ struct Iso9660InputStream {
Iso9660InputStream(Iso9660ArchiveFile &_archive, const char *uri,
Mutex &mutex, Cond &cond,
iso9660_stat_t *_statbuf)
:archive(&_archive), statbuf(_statbuf),
:base(iso9660_input_plugin, uri, mutex, cond),
archive(&_archive), statbuf(_statbuf),
max_blocks(CEILING(statbuf->size, ISO_BLOCKSIZE)) {
input_stream_init(&base, &iso9660_input_plugin, uri,
mutex, cond);
base.ready = true;
base.size = statbuf->size;
@@ -192,7 +191,6 @@ struct Iso9660InputStream {
~Iso9660InputStream() {
free(statbuf);
archive->Unref();
input_stream_deinit(&base);
}
};

View File

@@ -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);
}
};