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

20
src/command/OtherCommands.cxx
View File

@@ -123,17 +123,13 @@ handle_listfiles(Client &client, Request args, Response &r)
/* default is root directory */
const auto uri = args.GetOptional(0, "");
Error error;
const auto located_uri = LocateUri(uri, &client,
const auto located_uri = LocateUri(uri, &client
#ifdef ENABLE_DATABASE
nullptr,
, nullptr
#endif
error);
);
switch (located_uri.type) {
case LocatedUri::Type::UNKNOWN:
return print_error(r, error);
case LocatedUri::Type::ABSOLUTE:
#ifdef ENABLE_DATABASE
/* use storage plugin to list remote directory */
@@ -238,17 +234,13 @@ handle_lsinfo(Client &client, Request args, Response &r)
compatibility, work around this here */
uri = "";
Error error;
const auto located_uri = LocateUri(uri, &client,
const auto located_uri = LocateUri(uri, &client
#ifdef ENABLE_DATABASE
nullptr,
, nullptr
#endif
error);
);
switch (located_uri.type) {
case LocatedUri::Type::UNKNOWN:
return print_error(r, error);
case LocatedUri::Type::ABSOLUTE:
return handle_lsinfo_absolute(r, located_uri.canonical_uri);