diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/CommandError.cxx | 2 | ||||
| -rw-r--r-- | src/command/PlayerCommands.cxx | 2 | ||||
| -rw-r--r-- | src/util/Exception.cxx | 4 | ||||
| -rw-r--r-- | src/util/Exception.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/command/CommandError.cxx b/src/command/CommandError.cxx index 8f5badb4d..2834b2bf5 100644 --- a/src/command/CommandError.cxx +++ b/src/command/CommandError.cxx @@ -147,5 +147,5 @@ void PrintError(Response &r, std::exception_ptr ep) { LogError(ep); - r.Error(ToAck(ep), FullMessage(ep).c_str()); + r.Error(ToAck(ep), GetFullMessage(ep).c_str()); } diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx index e73157ce4..a6bcf878f 100644 --- a/src/command/PlayerCommands.cxx +++ b/src/command/PlayerCommands.cxx @@ -196,7 +196,7 @@ handle_status(Client &client, gcc_unused Request args, Response &r) pc.LockCheckRethrowError(); } catch (...) { r.Format(COMMAND_STATUS_ERROR ": %s\n", - FullMessage(std::current_exception()).c_str()); + GetFullMessage(std::current_exception()).c_str()); } song = playlist.GetNextPosition(); diff --git a/src/util/Exception.cxx b/src/util/Exception.cxx index 46a7d1558..2376f66cd 100644 --- a/src/util/Exception.cxx +++ b/src/util/Exception.cxx @@ -32,7 +32,7 @@ #include <stdexcept> std::string -FullMessage(std::exception_ptr ep) noexcept +GetFullMessage(std::exception_ptr ep) noexcept { try { std::rethrow_exception(ep); @@ -42,7 +42,7 @@ FullMessage(std::exception_ptr ep) noexcept return e.what(); } catch (...) { return std::string(e.what()) + "; " + - FullMessage(std::current_exception()); + GetFullMessage(std::current_exception()); } } diff --git a/src/util/Exception.hxx b/src/util/Exception.hxx index 9b8f9887d..8e6941ea0 100644 --- a/src/util/Exception.hxx +++ b/src/util/Exception.hxx @@ -38,6 +38,6 @@ * exceptions (if any). */ std::string -FullMessage(std::exception_ptr ep) noexcept; +GetFullMessage(std::exception_ptr ep) noexcept; #endif |