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

util/Exception: add "fallback" and "separator" parameters

Browse Source
This commit is contained in:
Max Kellermann
2017-07-05 16:59:40 +02:00
parent 3cfefa53f7
commit 2db8cf477b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/Exception.cxx
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016 Max Kellermann <max.kellermann@gmail.com> * Copyright (C) 2016-2017 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -32,7 +32,8 @@
#include <stdexcept> #include <stdexcept>
std::string std::string
GetFullMessage(std::exception_ptr ep) noexcept GetFullMessage(std::exception_ptr ep,
const char *fallback, const char *separator) noexcept
{ {
try { try {
std::rethrow_exception(ep); std::rethrow_exception(ep);
@@ -41,10 +42,11 @@ GetFullMessage(std::exception_ptr ep) noexcept
std::rethrow_if_nested(e); std::rethrow_if_nested(e);
return e.what(); return e.what();
} catch (...) { } catch (...) {
return std::string(e.what()) + "; " + return std::string(e.what()) + separator +
GetFullMessage(std::current_exception()); GetFullMessage(std::current_exception(),
fallback, separator);
} }
} }
return std::string("Unknown error"); return fallback;
} }

6
src/util/Exception.hxx
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016 Max Kellermann <max.kellermann@gmail.com> * Copyright (C) 2016-2017 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -38,6 +38,8 @@
* exceptions (if any). * exceptions (if any).
*/ */
std::string std::string
GetFullMessage(std::exception_ptr ep) noexcept; GetFullMessage(std::exception_ptr ep,
const char *fallback="Unknown exception",
const char *separator="; ") noexcept;
#endif #endif