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

config/Block: GetPath() throws exception on error

Browse Source
This commit is contained in:
Max Kellermann
2016-10-28 23:08:42 +02:00
parent d8bcdca55a
commit e17805f208
8 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,39 +78,27 @@ inline SimpleDatabase::SimpleDatabase(AllocatedPath &&_path,
Database *
SimpleDatabase::Create(gcc_unused EventLoop &loop,
gcc_unused DatabaseListener &listener,
const ConfigBlock &block, Error &error)
const ConfigBlock &block, Error &)
{
SimpleDatabase *db = new SimpleDatabase();
if (!db->Configure(block, error)) {
delete db;
db = nullptr;
}
db->Configure(block);
return db;
}
bool
SimpleDatabase::Configure(const ConfigBlock &block, Error &error)
void
SimpleDatabase::Configure(const ConfigBlock &block)
{
path = block.GetPath("path", error);
if (path.IsNull()) {
if (!error.IsDefined())
error.Set(simple_db_domain,
"No \"path\" parameter specified");
return false;
}
path = block.GetPath("path");
if (path.IsNull())
throw std::runtime_error("No \"path\" parameter specified");
path_utf8 = path.ToUTF8();
cache_path = block.GetPath("cache_directory", error);
if (path.IsNull() && error.IsDefined())
return false;
cache_path = block.GetPath("cache_directory");
#ifdef ENABLE_ZLIB
compress = block.GetBlockValue("compress", compress);
#endif
return true;
}
void