From 20555c8e37f90c8e8b9fc6595a7a31f2a18f1f23 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 22 Dec 2017 15:50:56 +0100 Subject: archive/File: remove unused attribute "plugin" --- src/archive/ArchiveFile.hxx | 6 ------ src/archive/plugins/Bzip2ArchivePlugin.cxx | 3 +-- src/archive/plugins/Iso9660ArchivePlugin.cxx | 2 +- src/archive/plugins/ZzipArchivePlugin.cxx | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/archive/ArchiveFile.hxx b/src/archive/ArchiveFile.hxx index 28e836702..3fa1f796b 100644 --- a/src/archive/ArchiveFile.hxx +++ b/src/archive/ArchiveFile.hxx @@ -27,12 +27,6 @@ class ArchiveVisitor; class InputStream; class ArchiveFile { -public: - const ArchivePlugin &plugin; - - ArchiveFile(const ArchivePlugin &_plugin) - :plugin(_plugin) {} - protected: /** * Use Close() instead of delete. diff --git a/src/archive/plugins/Bzip2ArchivePlugin.cxx b/src/archive/plugins/Bzip2ArchivePlugin.cxx index 04597e2a2..c2728f04a 100644 --- a/src/archive/plugins/Bzip2ArchivePlugin.cxx +++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx @@ -46,8 +46,7 @@ public: const InputStreamPtr istream; Bzip2ArchiveFile(Path path, InputStreamPtr &&_is) - :ArchiveFile(bz2_archive_plugin), - name(path.GetBase().c_str()), + :name(path.GetBase().c_str()), istream(std::move(_is)) { // remove .bz2 suffix const size_t len = name.length(); diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx index 536745d85..d5ec74e79 100644 --- a/src/archive/plugins/Iso9660ArchivePlugin.cxx +++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx @@ -45,7 +45,7 @@ class Iso9660ArchiveFile final : public ArchiveFile { public: Iso9660ArchiveFile(iso9660_t *_iso) - :ArchiveFile(iso9660_archive_plugin), iso(_iso) {} + :iso(_iso) {} ~Iso9660ArchiveFile() { iso9660_close(iso); diff --git a/src/archive/plugins/ZzipArchivePlugin.cxx b/src/archive/plugins/ZzipArchivePlugin.cxx index fc1e50b16..ad89a28c8 100644 --- a/src/archive/plugins/ZzipArchivePlugin.cxx +++ b/src/archive/plugins/ZzipArchivePlugin.cxx @@ -40,7 +40,7 @@ public: ZZIP_DIR *const dir; ZzipArchiveFile(ZZIP_DIR *_dir) - :ArchiveFile(zzip_archive_plugin), dir(_dir) {} + :dir(_dir) {} ~ZzipArchiveFile() { zzip_dir_close(dir); -- cgit v1.2.3