Remove use of non-standard zero variadic macros

These are a gnu extension warned against by: gnu-zero-variadic-macro-arguments
bitcoin · Feb 10, 2020 · 612e8e1 · 612e8e1
1 parent 081a0ab
commit 612e8e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/logging.h b/src/logging.h
@@ -178,7 +178,7 @@ static inline void LogPrintf(const char* fmt, const Args&... args)
 // evaluating arguments when logging for the category is not enabled.
 #define LogPrint(category, ...)              \
     do {                                     \
-        if (LogAcceptCategory((category))) { \
+        if ((category) == BCLog::LogFlags::ALL || LogAcceptCategory((category))) { \
             LogPrintf(__VA_ARGS__);          \
         }                                    \
     } while (0)

diff --git a/src/logging/timer.h b/src/logging/timer.h
@@ -93,10 +93,10 @@ class Timer
 } // namespace BCLog
 
 
-#define LOG_TIME_MILLIS(end_msg, ...) \
-    BCLog::Timer<std::chrono::milliseconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg, ## __VA_ARGS__)
-#define LOG_TIME_SECONDS(end_msg, ...) \
-    BCLog::Timer<std::chrono::seconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg, ## __VA_ARGS__)
+#define LOG_TIME_MILLIS(end_msg, log_category) \
+    BCLog::Timer<std::chrono::milliseconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg, log_category)
+#define LOG_TIME_SECONDS(end_msg, log_category) \
+    BCLog::Timer<std::chrono::seconds> PASTE2(logging_timer, __COUNTER__)(__func__, end_msg, log_category)
 
 
 #endif // BITCOIN_LOGGING_TIMER_H
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2328,7 +2328,7 @@ bool CChainState::FlushStateToDisk(
         // Flush best chain related state. This can only be done if the blocks / block index write was also done.
         if (fDoFullFlush && !CoinsTip().GetBestBlock().IsNull()) {
             LOG_TIME_SECONDS(strprintf("write coins cache to disk (%d coins, %.2fkB)",
-                coins_count, coins_mem_usage / 1000));
+                coins_count, coins_mem_usage / 1000), BCLog::ALL);
 
             // Typical Coin structures on disk are around 48 bytes in size.
             // Pushing a new one to the database can cause it to be written