summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-12-22 15:50:56 +0100
committerMax Kellermann <max@musicpd.org>2017-12-22 16:13:29 +0100
commit20555c8e37f90c8e8b9fc6595a7a31f2a18f1f23 (patch)
treef296f8647a391d47558b31ee937c2b561fad12d5
parent300a619991392662cf3406fee8b97c36e2132a0d (diff)
archive/File: remove unused attribute "plugin"
-rw-r--r--src/archive/ArchiveFile.hxx6
-rw-r--r--src/archive/plugins/Bzip2ArchivePlugin.cxx3
-rw-r--r--src/archive/plugins/Iso9660ArchivePlugin.cxx2
-rw-r--r--src/archive/plugins/ZzipArchivePlugin.cxx2
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);