aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-31 16:01:10 +0100
committerMax Kellermann <max@duempel.org>2009-12-31 16:26:34 +0100
commit0cc3b98bd9a4e2b9a0a9ae941c62e0dd7ac91457 (patch)
tree3923eb2ae2d0e7e82cfad062b1ed06034156bf8a
parentc157711eaf7cbe7052f55ba23d8d5ff30507caa3 (diff)
downloadmpd-0cc3b98bd9a4e2b9a0a9ae941c62e0dd7ac91457.tar.gz
mpd-0cc3b98bd9a4e2b9a0a9ae941c62e0dd7ac91457.tar.xz
mpd-0cc3b98bd9a4e2b9a0a9ae941c62e0dd7ac91457.zip
input/archive: don't initialize input_stream.ready
The archive plugin should decide this.
-rw-r--r--src/archive/bz2_archive_plugin.c1
-rw-r--r--src/archive/iso9660_archive_plugin.c1
-rw-r--r--src/archive/zzip_archive_plugin.c1
-rw-r--r--src/input/archive_input_plugin.c2
4 files changed, 3 insertions, 2 deletions
diff --git a/src/archive/bz2_archive_plugin.c b/src/archive/bz2_archive_plugin.c
index 7e0711676..975fd3f07 100644
--- a/src/archive/bz2_archive_plugin.c
+++ b/src/archive/bz2_archive_plugin.c
@@ -170,6 +170,7 @@ bz2_open_stream(struct archive_file *file, struct input_stream *is,
is->plugin = &bz2_inputplugin;
//insert back reference
is->data = bis;
+ is->ready = true;
is->seekable = false;
if (!bz2_alloc(bis, error_r)) {
diff --git a/src/archive/iso9660_archive_plugin.c b/src/archive/iso9660_archive_plugin.c
index ff8236663..3d5f33896 100644
--- a/src/archive/iso9660_archive_plugin.c
+++ b/src/archive/iso9660_archive_plugin.c
@@ -185,6 +185,7 @@ iso9660_archive_open_stream(struct archive_file *file, struct input_stream *is,
is->plugin = &iso9660_input_plugin;
//insert back reference
is->data = iis;
+ is->ready = true;
//we are not seekable
is->seekable = false;
diff --git a/src/archive/zzip_archive_plugin.c b/src/archive/zzip_archive_plugin.c
index 087071a47..fb7af74ed 100644
--- a/src/archive/zzip_archive_plugin.c
+++ b/src/archive/zzip_archive_plugin.c
@@ -145,6 +145,7 @@ zzip_archive_open_stream(struct archive_file *file, struct input_stream *is,
is->plugin = &zzip_input_plugin;
//insert back reference
is->data = zis;
+ is->ready = true;
//we are seekable (but its not recommendent to do so)
is->seekable = true;
diff --git a/src/input/archive_input_plugin.c b/src/input/archive_input_plugin.c
index 53d472a5a..248b8626e 100644
--- a/src/input/archive_input_plugin.c
+++ b/src/input/archive_input_plugin.c
@@ -71,8 +71,6 @@ input_archive_open(struct input_stream *is, const char *pathname,
if (!opened) {
archive_file_close(file);
- } else {
- is->ready = true;
}
return opened;