diff options
| author | Pieter Wuille <[email protected]> | 2016-12-23 14:22:46 -0800 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2016-12-23 14:22:46 -0800 |
| commit | 407cdd6cb8db7baacf3c4d7bf9bae5fe38d7f098 (patch) | |
| tree | e47b78cd0b2c012435921b700d13f965214e99dd /src | |
| parent | Merge #8589: Inline CTxInWitness inside CTxIn (diff) | |
| download | discoin-407cdd6cb8db7baacf3c4d7bf9bae5fe38d7f098.tar.xz discoin-407cdd6cb8db7baacf3c4d7bf9bae5fe38d7f098.zip | |
Do not evaluate hidden LogPrint arguments
Diffstat (limited to 'src')
| -rw-r--r-- | src/util.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/util.h b/src/util.h index 3ec38a7c7..c9ead65a8 100644 --- a/src/util.h +++ b/src/util.h @@ -74,14 +74,15 @@ bool LogAcceptCategory(const char* category); /** Send a string to the log output */ int LogPrintStr(const std::string &str); -#define LogPrintf(...) LogPrint(NULL, __VA_ARGS__) - -template<typename... Args> -static inline int LogPrint(const char* category, const char* fmt, const Args&... args) -{ - if(!LogAcceptCategory(category)) return 0; \ - return LogPrintStr(tfm::format(fmt, args...)); -} +#define LogPrint(category, ...) do { \ + if (LogAcceptCategory((category))) { \ + LogPrintStr(tfm::format(__VA_ARGS__)); \ + } \ +} while(0) + +#define LogPrintf(...) do { \ + LogPrintStr(tfm::format(__VA_ARGS__)); \ +} while(0) template<typename... Args> bool error(const char* fmt, const Args&... args) |