InputStream: remove attribute "plugin"
This commit is contained in:
@@ -108,8 +108,6 @@ struct Bzip2InputStream final : public InputStream {
|
||||
size_t Read(void *ptr, size_t size, Error &error) override;
|
||||
};
|
||||
|
||||
extern const InputPlugin bz2_inputplugin;
|
||||
|
||||
static constexpr Domain bz2_domain("bz2");
|
||||
|
||||
/* single archive handling allocation helpers */
|
||||
@@ -155,7 +153,7 @@ bz2_open(Path pathname, Error &error)
|
||||
Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context,
|
||||
const char *_uri,
|
||||
Mutex &_mutex, Cond &_cond)
|
||||
:InputStream(bz2_inputplugin, _uri, _mutex, _cond),
|
||||
:InputStream(_uri, _mutex, _cond),
|
||||
archive(&_context), eof(false)
|
||||
{
|
||||
archive->Ref();
|
||||
@@ -251,13 +249,6 @@ static const char *const bz2_extensions[] = {
|
||||
nullptr
|
||||
};
|
||||
|
||||
const InputPlugin bz2_inputplugin = {
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
};
|
||||
|
||||
const ArchivePlugin bz2_archive_plugin = {
|
||||
"bz2",
|
||||
nullptr,
|
||||
|
@@ -79,8 +79,6 @@ public:
|
||||
Error &error) override;
|
||||
};
|
||||
|
||||
extern const InputPlugin iso9660_input_plugin;
|
||||
|
||||
static constexpr Domain iso9660_domain("iso9660");
|
||||
|
||||
/* archive open && listing routine */
|
||||
@@ -149,7 +147,7 @@ public:
|
||||
Iso9660InputStream(Iso9660ArchiveFile &_archive, const char *_uri,
|
||||
Mutex &_mutex, Cond &_cond,
|
||||
iso9660_stat_t *_statbuf)
|
||||
:InputStream(iso9660_input_plugin, _uri, _mutex, _cond),
|
||||
:InputStream(_uri, _mutex, _cond),
|
||||
archive(_archive), statbuf(_statbuf) {
|
||||
size = statbuf->size;
|
||||
SetReady();
|
||||
@@ -231,13 +229,6 @@ static const char *const iso9660_archive_extensions[] = {
|
||||
nullptr
|
||||
};
|
||||
|
||||
const InputPlugin iso9660_input_plugin = {
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
};
|
||||
|
||||
const ArchivePlugin iso9660_archive_plugin = {
|
||||
"iso",
|
||||
nullptr,
|
||||
|
@@ -64,8 +64,6 @@ public:
|
||||
Error &error) override;
|
||||
};
|
||||
|
||||
extern const InputPlugin zzip_input_plugin;
|
||||
|
||||
static constexpr Domain zzip_domain("zzip");
|
||||
|
||||
/* archive open && listing routine */
|
||||
@@ -105,7 +103,7 @@ struct ZzipInputStream final : public InputStream {
|
||||
ZzipInputStream(ZzipArchiveFile &_archive, const char *_uri,
|
||||
Mutex &_mutex, Cond &_cond,
|
||||
ZZIP_FILE *_file)
|
||||
:InputStream(zzip_input_plugin, _uri, _mutex, _cond),
|
||||
:InputStream(_uri, _mutex, _cond),
|
||||
archive(&_archive), file(_file) {
|
||||
//we are seekable (but its not recommendent to do so)
|
||||
seekable = true;
|
||||
@@ -185,13 +183,6 @@ static const char *const zzip_archive_extensions[] = {
|
||||
nullptr
|
||||
};
|
||||
|
||||
const InputPlugin zzip_input_plugin = {
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
};
|
||||
|
||||
const ArchivePlugin zzip_archive_plugin = {
|
||||
"zzip",
|
||||
nullptr,
|
||||
|
Reference in New Issue
Block a user