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

Instance: remove Error parameter from GetDatabase()

Browse Source
This commit is contained in:
Max Kellermann 2016-10-26 18:52:00 +02:00
parent 086652dd50
commit 8d41e9658f
8 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Instance.cxx
View File

@ -35,15 +35,6 @@
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
Database *
Instance::GetDatabase(Error &error)
{
if (database == nullptr)
error.Set(db_domain, int(DatabaseErrorCode::DISABLED),
"No database");
return database;
}
const Database & const Database &
Instance::GetDatabaseOrThrow() const Instance::GetDatabaseOrThrow() const
{ {

4
src/Instance.hxx
View File

@ -109,7 +109,9 @@ struct Instance final
* if this MPD configuration has no database (no * if this MPD configuration has no database (no
* music_directory was configured). * music_directory was configured).
*/ */
Database *GetDatabase(Error &error); Database *GetDatabase() {
return database;
}
/** /**
* Returns the global #Database instance. Throws * Returns the global #Database instance. Throws

4
src/Partition.cxx
View File

@ -45,9 +45,9 @@ Partition::EmitIdle(unsigned mask)
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
const Database * const Database *
Partition::GetDatabase(Error &error) const Partition::GetDatabase() const
{ {
return instance.GetDatabase(error); return instance.GetDatabase();
} }
const Database & const Database &

2
src/Partition.hxx
View File

@ -183,7 +183,7 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
* if this MPD configuration has no database (no * if this MPD configuration has no database (no
* music_directory was configured). * music_directory was configured).
*/ */
const Database *GetDatabase(Error &error) const; const Database *GetDatabase() const;
gcc_pure gcc_pure
const Database &GetDatabaseOrThrow() const; const Database &GetDatabaseOrThrow() const;

2
src/SongLoader.cxx
View File

@ -32,7 +32,7 @@
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
SongLoader::SongLoader(const Client &_client) SongLoader::SongLoader(const Client &_client)
:client(&_client), db(_client.GetDatabase(IgnoreError())), :client(&_client), db(_client.GetDatabase()),
storage(_client.GetStorage()) {} storage(_client.GetStorage()) {}
#endif #endif

4
src/client/Client.cxx
View File

@ -28,9 +28,9 @@ const Domain client_domain("client");
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
const Database * const Database *
Client::GetDatabase(Error &error) const Client::GetDatabase() const
{ {
return partition.instance.GetDatabase(error); return partition.instance.GetDatabase();
} }
const Database & const Database &

2
src/client/Client.hxx
View File

@ -185,7 +185,7 @@ public:
* Wrapper for Instance::GetDatabase(). * Wrapper for Instance::GetDatabase().
*/ */
gcc_pure gcc_pure
const Database *GetDatabase(Error &error) const; const Database *GetDatabase() const;
/** /**
* Wrapper for Instance::GetDatabaseOrThrow(). * Wrapper for Instance::GetDatabaseOrThrow().

2
test/test_translate_song.cxx
View File

@ -131,7 +131,7 @@ DetachedSong::LoadFile(Path path)
} }
const Database * const Database *
Client::GetDatabase(gcc_unused Error &error) const Client::GetDatabase() const
{ {
return reinterpret_cast<const Database *>(this); return reinterpret_cast<const Database *>(this);
} }