aboutsummaryrefslogtreecommitdiff
path: root/src/util.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-02-26 13:23:52 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-02-26 13:23:52 +0100
commit44235713ed0ad1810328f21108d32bbac04de87b (patch)
treeb76a7b63c32f9e8dcc6b9af6b96ae4b493b9fcf8 /src/util.h
parent3480bf7c650bb14a31020c3ef33e76edea650e13 (diff)
Replace PrintException with PrintExceptionContinue + throw
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)
Diffstat (limited to 'src/util.h')
-rw-r--r--src/util.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/util.h b/src/util.h
index 6ef93021fd..8b1b7cd2aa 100644
--- a/src/util.h
+++ b/src/util.h
@@ -172,7 +172,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);
@@ -566,10 +565,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
@@ -589,10 +590,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;
}
}