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

command/Error: move code to ToAck(std::exception_ptr)

Browse Source
This commit is contained in:
Max Kellermann 2015-12-28 06:53:52 +01:00
parent fe0b6a1117
commit 19e43087a8
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/command/CommandError.cxx
View File

@ -158,6 +158,23 @@ print_error(Response &r, const Error &error)
return CommandResult::ERROR;
}
gcc_pure
static enum ack
ToAck(std::exception_ptr ep)
{
try {
std::rethrow_exception(ep);
} catch (const ProtocolError &pe) {
return pe.GetCode();
} catch (const PlaylistError &pe) {
return ToAck(pe.GetCode());
} catch (const std::system_error &e) {
return ACK_ERROR_SYSTEM;
} catch (...) {
return ACK_ERROR_UNKNOWN;
}
}
void
PrintError(Response &r, std::exception_ptr ep)
{
@ -170,14 +187,8 @@ PrintError(Response &r, std::exception_ptr ep)
try {
std::rethrow_exception(ep);
} catch (const ProtocolError &pe) {
r.Error(pe.GetCode(), pe.what());
} catch (const PlaylistError &pe) {
r.Error(ToAck(pe.GetCode()), pe.what());
} catch (const std::system_error &e) {
r.Error(ACK_ERROR_SYSTEM, e.what());
} catch (const std::exception &e) {
r.Error(ACK_ERROR_UNKNOWN, e.what());
r.Error(ToAck(ep), e.what());
} catch (...) {
r.Error(ACK_ERROR_UNKNOWN, "Unknown error");
}