meson: turn on log-message-verification by default in developer builds

I'm not _quite_ convinced that this a good idea… I'm at least keeping
it separate to make it easy to revert ;)

2 files changed, 8 insertions, 3 deletions

diff --git a/src/basic/log.c b/src/basic/log.c
index 12071e2ebd..8f36c1dfad 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -67,6 +67,10 @@ static bool prohibit_ipc = false;
  * use here. */
 static char *log_abort_msg = NULL;
 
+#if LOG_MESSAGE_VERIFICATION || defined(__COVERITY__)
+bool _log_message_dummy = false; /* Always false */
+#endif
+
 /* An assert to use in logging functions that does not call recursively
  * into our logging functions (since that might lead to a loop). */
 #define assert_raw(expr)                                                \
diff --git a/src/basic/log.h b/src/basic/log.h
index 7b89c4df63..b7b0a42e49 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -301,9 +301,10 @@ bool log_on_console(void) _pure_;
 /* Helper to wrap the main message in structured logging. The macro doesn't do much,
  * except to provide visual grouping of the format string and its arguments. */
 #if LOG_MESSAGE_VERIFICATION || defined(__COVERITY__)
-/* Do a fake formatting of the message string to let the scanner verify the arguments
- * against the format message. */
-#  define LOG_MESSAGE(fmt, ...) "MESSAGE=%.0d" fmt, printf(fmt, ##__VA_ARGS__), ##__VA_ARGS__
+/* Do a fake formatting of the message string to let the scanner verify the arguments against the format
+ * message. The variable will never be set to true, but we don't tell the compiler that :) */
+extern bool _log_message_dummy;
+#  define LOG_MESSAGE(fmt, ...) "MESSAGE=%.0d" fmt, (_log_message_dummy && printf(fmt, ##__VA_ARGS__)), ##__VA_ARGS__
 #else
 #  define LOG_MESSAGE(fmt, ...) "MESSAGE=" fmt, ##__VA_ARGS__
 #endif