From 16afdfd8747a1bd5af2d1acb4e0845bf9d0b89e7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 29 Jan 2013 23:36:58 +0100 Subject: ArchivePlugin: move instance methods to class ArchiveFile --- src/ArchivePlugin.cxx | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'src/ArchivePlugin.cxx') diff --git a/src/ArchivePlugin.cxx b/src/ArchivePlugin.cxx index db4bb1b58..7c5164220 100644 --- a/src/ArchivePlugin.cxx +++ b/src/ArchivePlugin.cxx @@ -34,9 +34,6 @@ archive_file_open(const struct archive_plugin *plugin, const char *path, ArchiveFile *file = plugin->open(path, error_r); if (file != NULL) { - assert(file->plugin.close != NULL); - assert(file->plugin.visit != nullptr); - assert(file->plugin.open_stream != NULL); assert(error_r == NULL || *error_r == NULL); } else { assert(error_r == NULL || *error_r != NULL); @@ -44,33 +41,3 @@ archive_file_open(const struct archive_plugin *plugin, const char *path, return file; } - -void -archive_file_close(ArchiveFile *file) -{ - assert(file != NULL); - assert(file->plugin.close != NULL); - - file->plugin.close(file); -} - -void -archive_file_visit(ArchiveFile *file, ArchiveVisitor &visitor) -{ - assert(file != NULL); - assert(file->plugin.visit != nullptr); - - file->plugin.visit(file, visitor); -} - -struct input_stream * -archive_file_open_stream(ArchiveFile *file, const char *path, - Mutex &mutex, Cond &cond, - GError **error_r) -{ - assert(file != NULL); - assert(file->plugin.open_stream != NULL); - - return file->plugin.open_stream(file, path, mutex, cond, - error_r); -} -- cgit v1.2.3