diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-06-17 06:36:32 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-06-17 06:36:34 -0400 |
| commit | 39bd9ddb8783807b9cde6288233e86ad7c85d61f (patch) | |
| tree | ed1f84b3a706636e9e89772274fc14c759e38e9c | |
| parent | 38389dd3a0cf7e452d6a4801f96a3b3eb9d9c359 (diff) | |
| parent | fa02b473132932c200be1750d1a5b1de14ea2383 (diff) | |
| download | bitcoin-39bd9ddb8783807b9cde6288233e86ad7c85d61f.tar.xz | |
Merge #19295: refactor: Use AbortError in FatalError
fa02b473132932c200be1750d1a5b1de14ea2383 refactor: Use AbortError in FatalError (MarcoFalke)
Pull request description:
`FatalError` has been copied from `AbortNode`, so the two should use the same style to avoid confusion.
Follow-up to #18927
ACKs for top commit:
hebasto:
ACK fa02b473132932c200be1750d1a5b1de14ea2383, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: 2cf6d18a6ffb5c2e5cf54f0a072a7cef6dc7e924152b2fee44e6ff2c6c53bad962afd364eda30d8a73883d656429ea68391090e6a27057e69eaefd7c4dad0a33
| -rw-r--r-- | src/index/base.cpp | 6 | ||||
| -rw-r--r-- | src/ui_interface.h | 1 | ||||
| -rw-r--r-- | src/validation.cpp | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/index/base.cpp b/src/index/base.cpp index 1d09f2e577..a93b67395d 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -17,15 +17,13 @@ constexpr char DB_BEST_BLOCK = 'B'; constexpr int64_t SYNC_LOG_INTERVAL = 30; // seconds constexpr int64_t SYNC_LOCATOR_WRITE_INTERVAL = 30; // seconds -template<typename... Args> +template <typename... Args> static void FatalError(const char* fmt, const Args&... args) { std::string strMessage = tfm::format(fmt, args...); SetMiscWarning(Untranslated(strMessage)); LogPrintf("*** %s\n", strMessage); - uiInterface.ThreadSafeMessageBox( - Untranslated("Error: A fatal internal error occurred, see debug.log for details"), - "", CClientUIInterface::MSG_ERROR); + AbortError(_("A fatal internal error occurred, see debug.log for details")); StartShutdown(); } diff --git a/src/ui_interface.h b/src/ui_interface.h index 9f70d7b35c..356d30eaf6 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -122,6 +122,7 @@ void InitWarning(const bilingual_str& str); /** Show error message **/ bool InitError(const bilingual_str& str); +constexpr auto AbortError = InitError; extern CClientUIInterface uiInterface; diff --git a/src/validation.cpp b/src/validation.cpp index 49c0142be2..8bb03fdb97 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1662,8 +1662,6 @@ bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex* pindex) return true; } -constexpr auto AbortError = InitError; - /** Abort with a message */ static bool AbortNode(const std::string& strMessage, bilingual_str user_message = bilingual_str()) { |