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

LocateUri: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-10-27 21:59:17 +02:00
parent 726fc53e62
commit 6961bd61ca
16 changed files with 74 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/SongLoader.cxx
View File

@@ -74,9 +74,6 @@ DetachedSong *
SongLoader::LoadSong(const LocatedUri &located_uri) const
{
switch (located_uri.type) {
case LocatedUri::Type::UNKNOWN:
gcc_unreachable();
case LocatedUri::Type::ABSOLUTE:
return new DetachedSong(located_uri.canonical_uri);
@@ -91,20 +88,17 @@ SongLoader::LoadSong(const LocatedUri &located_uri) const
}
DetachedSong *
SongLoader::LoadSong(const char *uri_utf8, Error &error) const
SongLoader::LoadSong(const char *uri_utf8) const
{
#if !CLANG_CHECK_VERSION(3,6)
/* disabled on clang due to -Wtautological-pointer-compare */
assert(uri_utf8 != nullptr);
#endif
const auto located_uri = LocateUri(uri_utf8, client,
const auto located_uri = LocateUri(uri_utf8, client
#ifdef ENABLE_DATABASE
storage,
, storage
#endif
error);
if (located_uri.IsUnknown())
return nullptr;
);
return LoadSong(located_uri);
}