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

fs/io/Reader: use C++ exceptions instead of class Error

Browse Source
This commit is contained in:
Max Kellermann
2015-12-16 11:05:33 +01:00
parent fe60c52c70
commit e6e7d6dbd6
33 changed files with 192 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View File

@@ -184,11 +184,9 @@ SimpleDatabase::Load(Error &error)
assert(!path.IsNull());
assert(root != nullptr);
TextFile file(path, error);
if (file.HasFailed())
return false;
TextFile file(path);
if (!db_load_internal(file, *root, error) || !file.Check(error))
if (!db_load_internal(file, *root, error))
return false;
FileInfo fi;
@@ -200,7 +198,7 @@ SimpleDatabase::Load(Error &error)
bool
SimpleDatabase::Open(Error &error)
{
try {
assert(prefixed_light_song == nullptr);
root = Directory::NewRoot();
@@ -223,6 +221,9 @@ SimpleDatabase::Open(Error &error)
}
return true;
} catch (const std::exception &e) {
error.Set(e);
return false;
}
void