mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge #19295: refactor: Use AbortError in FatalError

Browse source 
fa02b47313 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 fa02b47313, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 2cf6d18a6ffb5c2e5cf54f0a072a7cef6dc7e924152b2fee44e6ff2c6c53bad962afd364eda30d8a73883d656429ea68391090e6a27057e69eaefd7c4dad0a33
This commit is contained in:
MarcoFalke 2020-06-17 06:36:32 -04:00
commit 39bd9ddb87
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/index/base.cpp
View file

@ -17,15 +17,13 @@ constexpr char DB_BEST_BLOCK = 'B';
constexpr int64_t SYNC_LOG_INTERVAL = 30; // seconds constexpr int64_t SYNC_LOG_INTERVAL = 30; // seconds
constexpr int64_t SYNC_LOCATOR_WRITE_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) static void FatalError(const char* fmt, const Args&... args)
{ {
std::string strMessage = tfm::format(fmt, args...); std::string strMessage = tfm::format(fmt, args...);
SetMiscWarning(Untranslated(strMessage)); SetMiscWarning(Untranslated(strMessage));
LogPrintf("*** %s\n", strMessage); LogPrintf("*** %s\n", strMessage);
uiInterface.ThreadSafeMessageBox( AbortError(_("A fatal internal error occurred, see debug.log for details"));
Untranslated("Error: A fatal internal error occurred, see debug.log for details"),
"", CClientUIInterface::MSG_ERROR);
StartShutdown(); StartShutdown();
} }

1
src/ui_interface.h
View file

@ -122,6 +122,7 @@ void InitWarning(const bilingual_str& str);
/** Show error message **/ /** Show error message **/
bool InitError(const bilingual_str& str); bool InitError(const bilingual_str& str);
constexpr auto AbortError = InitError;
extern CClientUIInterface uiInterface; extern CClientUIInterface uiInterface;

2
src/validation.cpp
View file

@ -1662,8 +1662,6 @@ bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex* pindex)
return true; return true;
} }
constexpr auto AbortError = InitError;
/** Abort with a message */ /** Abort with a message */
static bool AbortNode(const std::string& strMessage, bilingual_str user_message = bilingual_str()) static bool AbortNode(const std::string& strMessage, bilingual_str user_message = bilingual_str())
{ {