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

util/Exception: rename FullMessage() to GetFullMessage()

Browse Source
This commit is contained in:
Max Kellermann 2017-07-05 12:25:55 +02:00
parent bce89feb13
commit 3cfefa53f7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/CommandError.cxx
View File

@ -147,5 +147,5 @@ void
PrintError(Response &r, std::exception_ptr ep) PrintError(Response &r, std::exception_ptr ep)
{ {
LogError(ep); LogError(ep);
r.Error(ToAck(ep), FullMessage(ep).c_str()); r.Error(ToAck(ep), GetFullMessage(ep).c_str());
} }

2
src/command/PlayerCommands.cxx
View File

@ -196,7 +196,7 @@ handle_status(Client &client, gcc_unused Request args, Response &r)
pc.LockCheckRethrowError(); pc.LockCheckRethrowError();
} catch (...) { } catch (...) {
r.Format(COMMAND_STATUS_ERROR ": %s\n", r.Format(COMMAND_STATUS_ERROR ": %s\n",
FullMessage(std::current_exception()).c_str()); GetFullMessage(std::current_exception()).c_str());
} }
song = playlist.GetNextPosition(); song = playlist.GetNextPosition();

4
src/util/Exception.cxx
View File

@ -32,7 +32,7 @@
#include <stdexcept> #include <stdexcept>
std::string std::string
FullMessage(std::exception_ptr ep) noexcept GetFullMessage(std::exception_ptr ep) noexcept
{ {
try { try {
std::rethrow_exception(ep); std::rethrow_exception(ep);
@ -42,7 +42,7 @@ FullMessage(std::exception_ptr ep) noexcept
return e.what(); return e.what();
} catch (...) { } catch (...) {
return std::string(e.what()) + "; " + return std::string(e.what()) + "; " +
FullMessage(std::current_exception()); GetFullMessage(std::current_exception());
} }
} }

2
src/util/Exception.hxx
View File

@ -38,6 +38,6 @@
* exceptions (if any). * exceptions (if any).
*/ */
std::string std::string
FullMessage(std::exception_ptr ep) noexcept; GetFullMessage(std::exception_ptr ep) noexcept;
#endif #endif