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

input/Plugin: migrate open() from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-09-09 15:37:06 +02:00
parent 63ab7767a3
commit fc7d3f64c0
44 changed files with 359 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/input/plugins/ArchiveInputPlugin.cxx
View File

@@ -25,14 +25,18 @@
#include "archive/ArchivePlugin.hxx"
#include "archive/ArchiveFile.hxx"
#include "../InputPlugin.hxx"
#include "../InputStream.hxx"
#include "fs/Path.hxx"
#include "Log.hxx"
#include "util/ScopeExit.hxx"
#include "util/Error.hxx"
#include <stdexcept>
#include <stdlib.h>
InputStream *
OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond, Error &error)
InputStreamPtr
OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond)
{
const ArchivePlugin *arplug;
@@ -57,22 +61,21 @@ OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond, Error &error)
return nullptr;
}
Error error;
auto file = archive_file_open(arplug, Path::FromFS(archive), error);
if (file == nullptr) {
return nullptr;
}
if (file == nullptr)
throw std::runtime_error(error.GetMessage());
AtScopeExit(file) {
file->Close();
};
return file->OpenStream(filename, mutex, cond, error);
return InputStreamPtr(file->OpenStream(filename, mutex, cond));
}
static InputStream *
input_archive_open(gcc_unused const char *filename,
gcc_unused Mutex &mutex, gcc_unused Cond &cond,
gcc_unused Error &error)
gcc_unused Mutex &mutex, gcc_unused Cond &cond)
{
/* dummy method; use OpenArchiveInputStream() instead */