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

fs/DirectoryReader: use C++ exceptions instead of class Error

Browse Source
This commit is contained in:
Max Kellermann
2015-12-29 12:41:45 +01:00
parent 826a654c95
commit f3503e0026
12 changed files with 79 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/OtherCommands.cxx
View File

@@ -49,6 +49,7 @@
#include "Partition.hxx"
#include "Instance.hxx"
#include "Idle.hxx"
#include "Log.hxx"
#ifdef ENABLE_DATABASE
#include "DatabaseCommands.hxx"
@@ -161,8 +162,7 @@ handle_listfiles(Client &client, Request args, Response &r)
case LocatedUri::Type::PATH:
/* list local directory */
return handle_listfiles_local(r, located_uri.canonical_uri,
located_uri.path);
return handle_listfiles_local(r, located_uri.path);
}
gcc_unreachable();
@@ -197,9 +197,11 @@ handle_lsinfo_relative(Client &client, Response &r, const char *uri)
#endif
if (isRootDirectory(uri)) {
Error error;
const auto &list = ListPlaylistFiles(error);
print_spl_list(r, list);
try {
print_spl_list(r, ListPlaylistFiles());
} catch (const std::exception &e) {
LogError(e);
}
} else {
#ifndef ENABLE_DATABASE
r.Error(ACK_ERROR_NO_EXIST, "No database");