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

command: remove the obsolete Error support code

Browse Source
This commit is contained in:
Max Kellermann
2016-11-10 12:51:22 +01:00
parent 43b285ef7a
commit 741c6f1179
4 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/command/CommandError.cxx
View File

@@ -22,7 +22,6 @@
#include "PlaylistError.hxx"
#include "db/DatabaseError.hxx"
#include "client/Response.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
#include <system_error>
@@ -82,30 +81,6 @@ ToAck(DatabaseErrorCode code)
}
#endif
gcc_pure
static enum ack
ToAck(const Error &error)
{
if (error.IsDomain(ack_domain)) {
return (enum ack)error.GetCode();
} else if (error.IsDomain(errno_domain)) {
return ACK_ERROR_SYSTEM;
}
return ACK_ERROR_UNKNOWN;
}
CommandResult
print_error(Response &r, const Error &error)
{
assert(error.IsDefined());
LogError(error);
r.Error(ToAck(error), error.GetMessage());
return CommandResult::ERROR;
}
gcc_pure
static enum ack
ToAck(std::exception_ptr ep)
@@ -125,8 +100,6 @@ ToAck(std::exception_ptr ep)
#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
} catch (const std::exception &e) {
#else
} catch (const Error &error) {
return ToAck(error);
} catch (...) {
#endif
try {
@@ -152,8 +125,6 @@ PrintError(Response &r, std::exception_ptr ep)
} catch (const std::exception &e) {
LogError(e);
r.Error(ToAck(ep), e.what());
} catch (const Error &error) {
print_error(r, error);
} catch (...) {
r.Error(ACK_ERROR_UNKNOWN, "Unknown error");
}