neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Replace PrintException with PrintExceptionContinue + throw

Browse Source 
Just a pet peeve.

(PrintException has exactly the same body as PrintExceptionContinue but
does a re-throw at the end. Move these re-throws to the call
site, this aids understanding what is going on as well as eliminates a
bit of code duplication in util.cpp)
This commit is contained in:
Wladimir J. van der Laan 2014-02-26 13:23:52 +01:00
parent 3480bf7c65
commit 44235713ed
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); nRet = abs(RPC_MISC_ERROR);
} }
catch (...) { catch (...) {
PrintException(NULL, "CommandLineRPC()"); PrintExceptionContinue(NULL, "CommandLineRPC()");
throw;
} }
if (strPrint != "") if (strPrint != "")

9
src/util.cpp
View File

@ -948,15 +948,6 @@ void LogException(std::exception* pex, const char* pszThread)
LogPrintf("\n%s", message); 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) void PrintExceptionContinue(std::exception* pex, const char* pszThread)
{ {
std::string message = FormatException(pex, pszThread); std::string message = FormatException(pex, pszThread);

13
src/util.h
View File

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