2 files changed, 16 insertions, 20 deletions

diff --git a/src/debug.cpp b/src/debug.cpp
index 84e6068a3..32095e0f8 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -100,46 +100,43 @@ char *DumpDebugFacilityNames(char *buf, char *last)
 
 /**
  * Internal function for outputting the debug line.
- * @param dbg Debug category.
- * @param buf Text line to output.
+ * @param level Debug category.
+ * @param message The message to output.
  */
-void debug_print(const char *dbg, const char *buf)
+void DebugPrint(const char *level, const std::string &message)
 {
 	if (_debug_socket != INVALID_SOCKET) {
-		char buf2[1024 + 32];
-
-		seprintf(buf2, lastof(buf2), "%sdbg: [%s] %s\n", GetLogPrefix(), dbg, buf);
+		std::string msg = fmt::format("{}dbg: [{}] {}\n", GetLogPrefix(), level, message);
 		/* Sending out an error when this fails would be nice, however... the error
 		 * would have to be send over this failing socket which won't work. */
-		send(_debug_socket, buf2, (int)strlen(buf2), 0);
+		send(_debug_socket, msg.c_str(), (int)msg.size(), 0);
 		return;
 	}
-	if (strcmp(dbg, "desync") == 0) {
+	if (strcmp(level, "desync") == 0) {
 		static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
 		if (f == nullptr) return;
 
-		fprintf(f, "%s%s\n", GetLogPrefix(), buf);
+		fprintf(f, "%s%s\n", GetLogPrefix(), message.c_str());
 		fflush(f);
 #ifdef RANDOM_DEBUG
-	} else if (strcmp(dbg, "random") == 0) {
+	} else if (strcmp(level, "random") == 0) {
 		static FILE *f = FioFOpenFile("random-out.log", "wb", AUTOSAVE_DIR);
 		if (f == nullptr) return;
 
-		fprintf(f, "%s\n", buf);
+		fprintf(f, "%s\n", message.c_str());
 		fflush(f);
 #endif
 	} else {
-		char buffer[512];
-		seprintf(buffer, lastof(buffer), "%sdbg: [%s] %s\n", GetLogPrefix(), dbg, buf);
+		std::string msg = fmt::format("{}dbg: [{}] {}\n", GetLogPrefix(), level, message);
 #if defined(_WIN32)
 		wchar_t system_buf[512];
-		convert_to_fs(buffer, system_buf, lengthof(system_buf));
+		convert_to_fs(msg.c_str(), system_buf, lengthof(system_buf));
 		fputws(system_buf, stderr);
 #else
-		fputs(buffer, stderr);
+		fputs(msg.c_str(), stderr);
 #endif
-		NetworkAdminConsole(dbg, buf);
-		IConsoleDebug(dbg, buf);
+		NetworkAdminConsole(level, message);
+		IConsoleDebug(level, message.c_str());
 	}
 }
 
diff --git a/src/debug.h b/src/debug.h
index fb33bcf2d..37375fb08 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -28,15 +28,14 @@
  * 6.. - extremely detailed spamming
  */
 
-void debug_print(const char *dbg, const char *buf);
-
 /**
  * Ouptut a line of debugging information.
  * @param name The category of debug information.
  * @param level The maximum debug level this message should be shown at. When the debug level for this category is set lower, then the message will not be shown.
  * @param format_string The formatting string of the message.
  */
-#define Debug(name, level, format_string, ...) if ((level) == 0 || _debug_ ## name ## _level >= (level)) debug_print(#name, fmt::format(FMT_STRING(format_string), ## __VA_ARGS__).c_str())
+#define Debug(name, level, format_string, ...) if ((level) == 0 || _debug_ ## name ## _level >= (level)) DebugPrint(#name, fmt::format(FMT_STRING(format_string), ## __VA_ARGS__))
+void DebugPrint(const char *level, const std::string &message);
 
 extern int _debug_driver_level;
 extern int _debug_grf_level;