InputStream: add static method OpenReady()

Merge some duplicate code.
This commit is contained in:
Max Kellermann
2013-12-29 18:08:49 +01:00
parent ea9aff1d3f
commit aeb2baa495
11 changed files with 47 additions and 62 deletions

View File

@@ -50,16 +50,6 @@ dump_input_stream(InputStream *is)
is->Lock();
/* wait until the stream becomes ready */
is->WaitReady();
if (!is->Check(error)) {
LogError(error);
is->Unlock();
return EXIT_FAILURE;
}
/* print meta data */
if (!is->mime.empty())
@@ -139,7 +129,7 @@ int main(int argc, char **argv)
Mutex mutex;
Cond cond;
is = InputStream::Open(argv[1], mutex, cond, error);
is = InputStream::OpenReady(argv[1], mutex, cond, error);
if (is != NULL) {
ret = dump_input_stream(is);
is->Close();