oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ArchivePlugin: move instance methods to class ArchiveFile

Browse Source
This commit is contained in:
Max Kellermann
2013-01-29 23:36:58 +01:00
parent 701fff03d2
commit 16afdfd874
9 changed files with 92 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ArchivePlugin.cxx
View File

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