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

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

Browse Source
This commit is contained in:
Max Kellermann
2016-09-09 18:34:55 +02:00
parent fc7d3f64c0
commit 220d9528a3
9 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/archive/plugins/Bzip2ArchivePlugin.cxx
View File

@@ -127,7 +127,7 @@ Bzip2InputStream::Open()
/* archive open && listing routine */
static ArchiveFile *
bz2_open(Path pathname, gcc_unused Error &error)
bz2_open(Path pathname)
{
static Mutex mutex;
static Cond cond;

11
src/archive/plugins/Iso9660ArchivePlugin.cxx
View File

@@ -123,16 +123,13 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
}
static ArchiveFile *
iso9660_archive_open(Path pathname, Error &error)
iso9660_archive_open(Path pathname)
{
/* open archive */
auto iso = iso9660_open(pathname.c_str());
if (iso == nullptr) {
error.Format(iso9660_domain,
"Failed to open ISO9660 file %s",
pathname.c_str());
return nullptr;
}
if (iso == nullptr)
throw FormatRuntimeError("Failed to open ISO9660 file %s",
pathname.c_str());
return new Iso9660ArchiveFile(iso);
}

10
src/archive/plugins/ZzipArchivePlugin.cxx
View File

@@ -68,14 +68,12 @@ static constexpr Domain zzip_domain("zzip");
/* archive open && listing routine */
static ArchiveFile *
zzip_archive_open(Path pathname, Error &error)
zzip_archive_open(Path pathname)
{
ZZIP_DIR *dir = zzip_dir_open(pathname.c_str(), nullptr);
if (dir == nullptr) {
error.Format(zzip_domain, "Failed to open ZIP file %s",
pathname.c_str());
return nullptr;
}
if (dir == nullptr)
throw FormatRuntimeError("Failed to open ZIP file %s",
pathname.c_str());
return new ZzipArchiveFile(dir);
}