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

ArchivePlugin: replace scan_reset(), scan_next() with visit()

Browse Source 
Add the interface ArchiveVisitor.
This commit is contained in:
Max Kellermann
2013-01-29 21:21:07 +01:00
parent a42f9fd4e2
commit 9f0fb8f6a8
8 changed files with 83 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ArchivePlugin.cxx
View File

@@ -38,8 +38,7 @@ archive_file_open(const struct archive_plugin *plugin, const char *path,
if (file != NULL) {
assert(file->plugin != NULL);
assert(file->plugin->close != NULL);
assert(file->plugin->scan_reset != NULL);
assert(file->plugin->scan_next != NULL);
assert(file->plugin->visit != nullptr);
assert(file->plugin->open_stream != NULL);
assert(error_r == NULL || *error_r == NULL);
} else {
@@ -60,24 +59,13 @@ archive_file_close(struct archive_file *file)
}
void
archive_file_scan_reset(struct archive_file *file)
archive_file_visit(archive_file *file, ArchiveVisitor &visitor)
{
assert(file != NULL);
assert(file->plugin != NULL);
assert(file->plugin->scan_reset != NULL);
assert(file->plugin->scan_next != NULL);
assert(file->plugin->visit != nullptr);
file->plugin->scan_reset(file);
}
const char *
archive_file_scan_next(struct archive_file *file)
{
assert(file != NULL);
assert(file->plugin != NULL);
assert(file->plugin->scan_next != NULL);
return file->plugin->scan_next(file);
file->plugin->visit(file, visitor);
}
struct input_stream *