From 08e43a0814db386a5e3bdea7aea538f2d9b74c59 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sat, 22 Apr 2023 22:43:10 +0100
Subject: [PATCH] Simplify CCLOG macros in CheckCaches

---
 src/openttd.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/openttd.cpp b/src/openttd.cpp
index 5fd6468a36..f66a3106a6 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1483,14 +1483,18 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log, CheckC
 	}
 
 	char cclog_buffer[1024];
+	auto cclog_common = [&]() {
+		DEBUG(desync, 0, "%s", cclog_buffer);
+		if (log) {
+			log(cclog_buffer);
+		} else {
+			LogDesyncMsg(cclog_buffer);
+		}
+	};
+
 #define CCLOG(...) { \
 	seprintf(cclog_buffer, lastof(cclog_buffer), __VA_ARGS__); \
-	DEBUG(desync, 0, "%s", cclog_buffer); \
-	if (log) { \
-		log(cclog_buffer); \
-	} else { \
-		LogDesyncMsg(cclog_buffer); \
-	} \
+	cclog_common(); \
 }
 
 	auto output_veh_info = [&](char *&p, const Vehicle *u, const Vehicle *v, uint length) {
@@ -1500,12 +1504,7 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log, CheckC
 #define CCLOGV(...) { \
 	char *p = cclog_buffer + seprintf(cclog_buffer, lastof(cclog_buffer), __VA_ARGS__); \
 	output_veh_info(p, u, v, length); \
-	DEBUG(desync, 0, "%s", cclog_buffer); \
-	if (log) { \
-		log(cclog_buffer); \
-	} else { \
-		LogDesyncMsg(cclog_buffer); \
-	} \
+	cclog_common(); \
 }
 
 	if (flags & CHECK_CACHE_GENERAL) {