maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3749

Browse source 
4423571 Replace PrintException with PrintExceptionContinue + throw (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2014-02-26 20:52:24 +01:00
parent ae7e5d7ceb 44235713ed
commit b81f9718df
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/rpcclient.cpp
View file

@ -236,7 +236,8 @@ int CommandLineRPC(int argc, char *argv[])
nRet = abs(RPC_MISC_ERROR);
}
catch (...) {
PrintException(NULL, "CommandLineRPC()");
PrintExceptionContinue(NULL, "CommandLineRPC()");
throw;
}
if (strPrint != "")

9
src/util.cpp
View file

@ -948,15 +948,6 @@ void LogException(std::exception* pex, const char* pszThread)
LogPrintf("\n%s", message);
}
void PrintException(std::exception* pex, const char* pszThread)
{
std::string message = FormatException(pex, pszThread);
LogPrintf("\n\n************************\n%s\n", message);
fprintf(stderr, "\n\n************************\n%s\n", message.c_str());
strMiscWarning = message;
throw;
}
void PrintExceptionContinue(std::exception* pex, const char* pszThread)
{
std::string message = FormatException(pex, pszThread);

13
src/util.h
View file

@ -164,7 +164,6 @@ static inline bool error(const char* format)
void LogException(std::exception* pex, const char* pszThread);
void PrintException(std::exception* pex, const char* pszThread);
void PrintExceptionContinue(std::exception* pex, const char* pszThread);
void ParseString(const std::string& str, char c, std::vector<std::string>& v);
std::string FormatMoney(int64_t n, bool fPlus=false);
@ -558,10 +557,12 @@ template <typename Callable> void LoopForever(const char* name, Callable func,
throw;
}
catch (std::exception& e) {
PrintException(&e, name);
PrintExceptionContinue(&e, name);
throw;
}
catch (...) {
PrintException(NULL, name);
PrintExceptionContinue(NULL, name);
throw;
}
}
// .. and a wrapper that just calls func once
@ -581,10 +582,12 @@ template <typename Callable> void TraceThread(const char* name, Callable func)
throw;
}
catch (std::exception& e) {
PrintException(&e, name);
PrintExceptionContinue(&e, name);
throw;
}
catch (...) {
PrintException(NULL, name);
PrintExceptionContinue(NULL, name);
throw;
}
}