[GEN][ZH] Automatically add trailing new lines in debug log messages (#1232)

xezon · xezon · commit 7ee40d6e66be · 2025-07-13T11:41:37.000+02:00
diff --git a/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp b/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp
@@ -35,6 +35,7 @@ void DebugLog(const char *format, ...)
 	va_start(arg, format);
 	vprintf(format, arg);
 	va_end(arg);
+	printf("\n");
 }
 
 #endif
@@ -49,6 +50,7 @@ void DebugCrash(const char *format, ...)
 	va_start(arg, format);
 	vprintf(format, arg);
 	va_end(arg);
+	printf("\n");
 
 	// No exit in this stub
 }
diff --git a/Core/Tools/CRCDiff/debug.cpp b/Core/Tools/CRCDiff/debug.cpp
@@ -37,8 +37,9 @@ void DebugLog(const char *fmt, ...)
 	buffer[1023] = 0;
 	va_end( va );
 
-	printf( "%s", buffer );
+	printf( "%s\n", buffer );
 	OutputDebugString( buffer );
+	OutputDebugString( "\n" );
 }
 
 #endif // DEBUG
diff --git a/Core/Tools/Compress/Compress.cpp b/Core/Tools/Compress/Compress.cpp
@@ -17,13 +17,24 @@
 */
 
 #include <string>
-#include <cstdio>
+#include <Utility/stdio_adapter.h>
+#include <cstdarg>
 #include "Lib/BaseTypeCore.h"
 #include "Compression.h"
 
 
 // TheSuperHackers @todo Streamline and simplify the logging approach for tools
-#define DEBUG_LOG(x) printf x
+static void DebugLog(const char* format, ...)
+{
+	char buffer[1024];
+	buffer[0] = 0;
+	va_list args;
+	va_start(args, format);
+	vsnprintf(buffer, 1024, format, args);
+	va_end(args);
+	printf("%s\n", buffer);
+}
+#define DEBUG_LOG(x) DebugLog x
 
 
 void dumpHelp(const char *exe)
diff --git a/Core/Tools/PATCHGET/debug.cpp b/Core/Tools/PATCHGET/debug.cpp
@@ -44,22 +44,22 @@ static int doCrashBox(const char *buffer, bool logResult)
 		case IDABORT:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Abort]\n");
+				DebugLog("[Abort]");
 #endif
 			_exit(1);
 			break;
 		case IDRETRY:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Retry]\n");
+				DebugLog("[Retry]");
 #endif
 			::DebugBreak();
 			break;
 		case IDIGNORE:
 #ifdef DEBUG_LOGGING
 			// do nothing, just keep going
 			if (logResult)
-				DebugLog("[Ignore]\n");
+				DebugLog("[Ignore]");
 #endif
 			break;
 	}
@@ -77,7 +77,8 @@ void DebugLog(const char *fmt, ...)
 	va_end( va );
 
 	OutputDebugString(theBuffer);
-	printf( "%s", theBuffer );
+	OutputDebugString("\n");
+	printf( "%s\n", theBuffer );
 }
 
 #endif // defined(DEBUG) || defined(DEBUG_LOGGING)
@@ -98,9 +99,10 @@ void DebugCrash(const char *format, ...)
 		::MessageBox(NULL, "String too long for debug buffers", "", MB_OK|MB_APPLMODAL);
 
 	OutputDebugString(theBuffer);
-	printf( "%s", theBuffer );
+	OutputDebugString("\n");
+	printf( "%s\n", theBuffer );
 
-	strcat(theBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");
+	strcat(theBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue");
 
 	int result = doCrashBox(theBuffer, true);
 
diff --git a/Core/Tools/matchbot/wlib/wdebug.h b/Core/Tools/matchbot/wlib/wdebug.h
@@ -197,6 +197,7 @@ extern CritSec DebugLibSemaphore;
   __s << __FILE__ << "[" << __LINE__ << \
        "]: " << ##V << " = " << V << '\n' << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
 }
 
@@ -211,6 +212,7 @@ extern CritSec DebugLibSemaphore;
   __s << "DBG [" << __FILE__ <<  \
     " " << __LINE__ << "] " << X << '\n' << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
 }
 
@@ -223,6 +225,7 @@ extern CritSec DebugLibSemaphore;
   strstream __s;\
   __s << X << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
 }    
 
@@ -237,6 +240,7 @@ extern CritSec DebugLibSemaphore;
   __s  << __FILE__ << "[" << __LINE__ << \
      "]: " << ##X << '\n' << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
 }
 
diff --git a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp
@@ -233,7 +233,7 @@ static void doLogOutput(const char *buffer)
 	{
 		if (theLogFile)
 		{
-			fprintf(theLogFile, "%s", buffer);	// note, no \n (should be there already)
+			fprintf(theLogFile, "%s\n", buffer);
 			fflush(theLogFile);
 		}
 	}
@@ -242,10 +242,11 @@ static void doLogOutput(const char *buffer)
 	if (theDebugFlags & DEBUG_FLAG_LOG_TO_CONSOLE)
 	{
 		::OutputDebugString(buffer);
+		::OutputDebugString("\n");
 	}
 
 #ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG
-	addCRCDebugLineNoCounter("%s", buffer);
+	addCRCDebugLineNoCounter("%s\n", buffer);
 #endif
 }
 #endif
@@ -274,22 +275,22 @@ static int doCrashBox(const char *buffer, Bool logResult)
 		case IDABORT:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Abort]\n");
+				DebugLog("[Abort]");
 #endif
 			_exit(1);
 			break;
 		case IDRETRY:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Retry]\n");
+				DebugLog("[Retry]");
 #endif
 			::DebugBreak();
 			break;
 		case IDIGNORE:
 #ifdef DEBUG_LOGGING
 			// do nothing, just keep going
 			if (logResult)
-				DebugLog("[Ignore]\n");
+				DebugLog("[Ignore]");
 #endif
 			break;
 	}
@@ -308,7 +309,7 @@ static void doStackDump()
 	const int STACKTRACE_SKIP = 2;
 	void* stacktrace[STACKTRACE_SIZE];
 
-	doLogOutput("\nStack Dump:\n");
+	doLogOutput("\nStack Dump:");
 	::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
 	::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, doLogOutput);
 }
@@ -396,7 +397,7 @@ void DebugInit(int flags)
 		theLogFile = fopen(theLogFileName, "w");
 		if (theLogFile != NULL)
 		{
-			DebugLog("Log %s opened: %s\n", theLogFileName, getCurrentTimeString());
+			DebugLog("Log %s opened: %s", theLogFileName, getCurrentTimeString());
 		} 
 	#endif
 	}
@@ -494,7 +495,7 @@ void DebugCrash(const char *format, ...)
 #ifdef DEBUG_LOGGING
 	if (ignoringAsserts()) 
 	{
-		doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!\n");
+		doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!");
 	}
 	whackFunnyCharacters(theCrashBuffer);
 	doLogOutput(theCrashBuffer);
@@ -506,7 +507,7 @@ void DebugCrash(const char *format, ...)
 	}
 #endif
 
-	strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");
+	strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue");
 
 	int result = doCrashBox(theCrashBuffer, true);
 
@@ -546,7 +547,7 @@ void DebugShutdown()
 #ifdef DEBUG_LOGGING
 	if (theLogFile)
 	{
-		DebugLog("Log closed: %s\n", getCurrentTimeString());
+		DebugLog("Log closed: %s", getCurrentTimeString());
 		fclose(theLogFile);
 	}
 	theLogFile = NULL;
@@ -623,9 +624,9 @@ void SimpleProfiler::stopAndLog(const char *msg, int howOftenToLog, int howOften
 	{
 		m_numSessions = 0;
 		m_totalAllSessions = 0;
-		DEBUG_LOG(("%s: reset averages\n",msg));
+		DEBUG_LOG(("%s: reset averages",msg));
 	}
-	DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec\n",msg,getTime(),getTotalTime(),getAverageTime()));
+	DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec",msg,getTime(),getTotalTime(),getAverageTime()));
 }
 
 // ----------------------------------------------------------------------------
@@ -682,7 +683,7 @@ double SimpleProfiler::getAverageTime()
 	{
 		if (theReleaseCrashLogFile)
 		{
-			fprintf(theReleaseCrashLogFile, "%s", buffer);	// note, no \n (should be there already)
+			fprintf(theReleaseCrashLogFile, "%s\n", buffer);
 			fflush(theReleaseCrashLogFile);
 		}
 	}
diff --git a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp
@@ -135,6 +135,7 @@ static void WWDebug_Message_Callback(DebugType type, const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 #endif
 }
 
@@ -143,6 +144,7 @@ static void WWAssert_Callback(const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 	::DebugBreak();
 #endif
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp
@@ -234,7 +234,7 @@ static void doLogOutput(const char *buffer)
 	{
 		if (theLogFile)
 		{
-			fprintf(theLogFile, "%s", buffer);	// note, no \n (should be there already)
+			fprintf(theLogFile, "%s\n", buffer);
 			fflush(theLogFile);
 		}
 	}
@@ -243,10 +243,11 @@ static void doLogOutput(const char *buffer)
 	if (theDebugFlags & DEBUG_FLAG_LOG_TO_CONSOLE)
 	{
 		::OutputDebugString(buffer);
+		::OutputDebugString("\n");
 	}
 
 #ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG
-	addCRCDebugLineNoCounter("%s", buffer);
+	addCRCDebugLineNoCounter("%s\n", buffer);
 #endif
 }
 #endif
@@ -275,22 +276,22 @@ static int doCrashBox(const char *buffer, Bool logResult)
 		case IDABORT:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Abort]\n");
+				DebugLog("[Abort]");
 #endif
 			_exit(1);
 			break;
 		case IDRETRY:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Retry]\n");
+				DebugLog("[Retry]");
 #endif
 			::DebugBreak();
 			break;
 		case IDIGNORE:
 #ifdef DEBUG_LOGGING
 			// do nothing, just keep going
 			if (logResult)
-				DebugLog("[Ignore]\n");
+				DebugLog("[Ignore]");
 #endif
 			break;
 	}
@@ -309,7 +310,7 @@ static void doStackDump()
 	const int STACKTRACE_SKIP = 2;
 	void* stacktrace[STACKTRACE_SIZE];
 
-	doLogOutput("\nStack Dump:\n");
+	doLogOutput("\nStack Dump:");
 	::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
 	::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, doLogOutput);
 }
@@ -397,7 +398,7 @@ void DebugInit(int flags)
 		theLogFile = fopen(theLogFileName, "w");
 		if (theLogFile != NULL)
 		{
-			DebugLog("Log %s opened: %s\n", theLogFileName, getCurrentTimeString());
+			DebugLog("Log %s opened: %s", theLogFileName, getCurrentTimeString());
 		} 
 	#endif
 	}
@@ -495,7 +496,7 @@ void DebugCrash(const char *format, ...)
 #ifdef DEBUG_LOGGING
 	if (ignoringAsserts()) 
 	{
-		doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!\n");
+		doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!");
 	}
 	whackFunnyCharacters(theCrashBuffer);
 	doLogOutput(theCrashBuffer);
@@ -507,7 +508,7 @@ void DebugCrash(const char *format, ...)
 	}
 #endif
 
-	strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");
+	strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue");
 
 	int result = doCrashBox(theCrashBuffer, true);
 
@@ -547,7 +548,7 @@ void DebugShutdown()
 #ifdef DEBUG_LOGGING
 	if (theLogFile)
 	{
-		DebugLog("Log closed: %s\n", getCurrentTimeString());
+		DebugLog("Log closed: %s", getCurrentTimeString());
 		fclose(theLogFile);
 	}
 	theLogFile = NULL;
@@ -624,9 +625,9 @@ void SimpleProfiler::stopAndLog(const char *msg, int howOftenToLog, int howOften
 	{
 		m_numSessions = 0;
 		m_totalAllSessions = 0;
-		DEBUG_LOG(("%s: reset averages\n",msg));
+		DEBUG_LOG(("%s: reset averages",msg));
 	}
-	DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec\n",msg,getTime(),getTotalTime(),getAverageTime()));
+	DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec",msg,getTime(),getTotalTime(),getAverageTime()));
 }
 
 // ----------------------------------------------------------------------------
@@ -683,7 +684,7 @@ double SimpleProfiler::getAverageTime()
 	{
 		if (theReleaseCrashLogFile)
 		{
-			fprintf(theReleaseCrashLogFile, "%s", buffer);	// note, no \n (should be there already)
+			fprintf(theReleaseCrashLogFile, "%s\n", buffer);
 			fflush(theReleaseCrashLogFile);
 		}
 	}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
@@ -135,6 +135,7 @@ static void WWDebug_Message_Callback(DebugType type, const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 #endif
 }
 
@@ -143,6 +144,7 @@ static void WWAssert_Callback(const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 	::DebugBreak();
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ void DebugLog(const char *format, ...)`
`35`	`35`	`va_start(arg, format);`
`36`	`36`	`vprintf(format, arg);`
`37`	`37`	`va_end(arg);`
	`38`	`+ printf("\n");`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`#endif`
`@@ -49,6 +50,7 @@ void DebugCrash(const char *format, ...)`
`49`	`50`	`va_start(arg, format);`
`50`	`51`	`vprintf(format, arg);`
`51`	`52`	`va_end(arg);`
	`53`	`+ printf("\n");`
`52`	`54`
`53`	`55`	`// No exit in this stub`
`54`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,9 @@ void DebugLog(const char *fmt, ...)`
`37`	`37`	`buffer[1023] = 0;`
`38`	`38`	`va_end( va );`
`39`	`39`
`40`		`- printf( "%s", buffer );`
	`40`	`+ printf( "%s\n", buffer );`
`41`	`41`	`OutputDebugString( buffer );`
	`42`	`+ OutputDebugString( "\n" );`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`#endif // DEBUG`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ static void doLogOutput(const char *buffer)`
`233`	`233`	`{`
`234`	`234`	`if (theLogFile)`
`235`	`235`	`{`
`236`		`- fprintf(theLogFile, "%s", buffer); // note, no \n (should be there already)`
	`236`	`+ fprintf(theLogFile, "%s\n", buffer);`
`237`	`237`	`fflush(theLogFile);`
`238`	`238`	`}`
`239`	`239`	`}`
`@@ -242,10 +242,11 @@ static void doLogOutput(const char *buffer)`
`242`	`242`	`if (theDebugFlags & DEBUG_FLAG_LOG_TO_CONSOLE)`
`243`	`243`	`{`
`244`	`244`	`::OutputDebugString(buffer);`
	`245`	`+ ::OutputDebugString("\n");`
`245`	`246`	`}`
`246`	`247`
`247`	`248`	`#ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG`
`248`		`- addCRCDebugLineNoCounter("%s", buffer);`
	`249`	`+ addCRCDebugLineNoCounter("%s\n", buffer);`
`249`	`250`	`#endif`
`250`	`251`	`}`
`251`	`252`	`#endif`
`@@ -274,22 +275,22 @@ static int doCrashBox(const char *buffer, Bool logResult)`
`274`	`275`	`case IDABORT:`
`275`	`276`	`#ifdef DEBUG_LOGGING`
`276`	`277`	`if (logResult)`
`277`		`- DebugLog("[Abort]\n");`
	`278`	`+ DebugLog("[Abort]");`
`278`	`279`	`#endif`
`279`	`280`	`_exit(1);`
`280`	`281`	`break;`
`281`	`282`	`case IDRETRY:`
`282`	`283`	`#ifdef DEBUG_LOGGING`
`283`	`284`	`if (logResult)`
`284`		`- DebugLog("[Retry]\n");`
	`285`	`+ DebugLog("[Retry]");`
`285`	`286`	`#endif`
`286`	`287`	`::DebugBreak();`
`287`	`288`	`break;`
`288`	`289`	`case IDIGNORE:`
`289`	`290`	`#ifdef DEBUG_LOGGING`
`290`	`291`	`// do nothing, just keep going`
`291`	`292`	`if (logResult)`
`292`		`- DebugLog("[Ignore]\n");`
	`293`	`+ DebugLog("[Ignore]");`
`293`	`294`	`#endif`
`294`	`295`	`break;`
`295`	`296`	`}`
`@@ -308,7 +309,7 @@ static void doStackDump()`
`308`	`309`	`const int STACKTRACE_SKIP = 2;`
`309`	`310`	`void* stacktrace[STACKTRACE_SIZE];`
`310`	`311`
`311`		`- doLogOutput("\nStack Dump:\n");`
	`312`	`+ doLogOutput("\nStack Dump:");`
`312`	`313`	`::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);`
`313`	`314`	`::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, doLogOutput);`
`314`	`315`	`}`
`@@ -396,7 +397,7 @@ void DebugInit(int flags)`
`396`	`397`	`theLogFile = fopen(theLogFileName, "w");`
`397`	`398`	`if (theLogFile != NULL)`
`398`	`399`	`{`
`399`		`- DebugLog("Log %s opened: %s\n", theLogFileName, getCurrentTimeString());`
	`400`	`+ DebugLog("Log %s opened: %s", theLogFileName, getCurrentTimeString());`
`400`	`401`	`}`
`401`	`402`	`#endif`
`402`	`403`	`}`
`@@ -494,7 +495,7 @@ void DebugCrash(const char *format, ...)`
`494`	`495`	`#ifdef DEBUG_LOGGING`
`495`	`496`	`if (ignoringAsserts())`
`496`	`497`	`{`
`497`		`- doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!\n");`
	`498`	`+ doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!");`
`498`	`499`	`}`
`499`	`500`	`whackFunnyCharacters(theCrashBuffer);`
`500`	`501`	`doLogOutput(theCrashBuffer);`
`@@ -506,7 +507,7 @@ void DebugCrash(const char *format, ...)`
`506`	`507`	`}`
`507`	`508`	`#endif`
`508`	`509`
`509`		`- strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");`
	`510`	`+ strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue");`
`510`	`511`
`511`	`512`	`int result = doCrashBox(theCrashBuffer, true);`
`512`	`513`
`@@ -546,7 +547,7 @@ void DebugShutdown()`
`546`	`547`	`#ifdef DEBUG_LOGGING`
`547`	`548`	`if (theLogFile)`
`548`	`549`	`{`
`549`		`- DebugLog("Log closed: %s\n", getCurrentTimeString());`
	`550`	`+ DebugLog("Log closed: %s", getCurrentTimeString());`
`550`	`551`	`fclose(theLogFile);`
`551`	`552`	`}`
`552`	`553`	`theLogFile = NULL;`
`@@ -623,9 +624,9 @@ void SimpleProfiler::stopAndLog(const char *msg, int howOftenToLog, int howOften`
`623`	`624`	`{`
`624`	`625`	`m_numSessions = 0;`
`625`	`626`	`m_totalAllSessions = 0;`
`626`		`- DEBUG_LOG(("%s: reset averages\n",msg));`
	`627`	`+ DEBUG_LOG(("%s: reset averages",msg));`
`627`	`628`	`}`
`628`		`- DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec\n",msg,getTime(),getTotalTime(),getAverageTime()));`
	`629`	`+ DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec",msg,getTime(),getTotalTime(),getAverageTime()));`
`629`	`630`	`}`
`630`	`631`
`631`	`632`	`// ----------------------------------------------------------------------------`
`@@ -682,7 +683,7 @@ double SimpleProfiler::getAverageTime()`
`682`	`683`	`{`
`683`	`684`	`if (theReleaseCrashLogFile)`
`684`	`685`	`{`
`685`		`- fprintf(theReleaseCrashLogFile, "%s", buffer); // note, no \n (should be there already)`
	`686`	`+ fprintf(theReleaseCrashLogFile, "%s\n", buffer);`
`686`	`687`	`fflush(theReleaseCrashLogFile);`
`687`	`688`	`}`
`688`	`689`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ static void WWDebug_Message_Callback(DebugType type, const char * message)`
`135`	`135`	`{`
`136`	`136`	`#ifdef RTS_DEBUG`
`137`	`137`	`::OutputDebugString(message);`
	`138`	`+ ::OutputDebugString("\n");`
`138`	`139`	`#endif`
`139`	`140`	`}`
`140`	`141`
`@@ -143,6 +144,7 @@ static void WWAssert_Callback(const char * message)`
`143`	`144`	`{`
`144`	`145`	`#ifdef RTS_DEBUG`
`145`	`146`	`::OutputDebugString(message);`
	`147`	`+ ::OutputDebugString("\n");`
`146`	`148`	`::DebugBreak();`
`147`	`149`	`#endif`
`148`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ static void doLogOutput(const char *buffer)`
`234`	`234`	`{`
`235`	`235`	`if (theLogFile)`
`236`	`236`	`{`
`237`		`- fprintf(theLogFile, "%s", buffer); // note, no \n (should be there already)`
	`237`	`+ fprintf(theLogFile, "%s\n", buffer);`
`238`	`238`	`fflush(theLogFile);`
`239`	`239`	`}`
`240`	`240`	`}`
`@@ -243,10 +243,11 @@ static void doLogOutput(const char *buffer)`
`243`	`243`	`if (theDebugFlags & DEBUG_FLAG_LOG_TO_CONSOLE)`
`244`	`244`	`{`
`245`	`245`	`::OutputDebugString(buffer);`
	`246`	`+ ::OutputDebugString("\n");`
`246`	`247`	`}`
`247`	`248`
`248`	`249`	`#ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG`
`249`		`- addCRCDebugLineNoCounter("%s", buffer);`
	`250`	`+ addCRCDebugLineNoCounter("%s\n", buffer);`
`250`	`251`	`#endif`
`251`	`252`	`}`
`252`	`253`	`#endif`
`@@ -275,22 +276,22 @@ static int doCrashBox(const char *buffer, Bool logResult)`
`275`	`276`	`case IDABORT:`
`276`	`277`	`#ifdef DEBUG_LOGGING`
`277`	`278`	`if (logResult)`
`278`		`- DebugLog("[Abort]\n");`
	`279`	`+ DebugLog("[Abort]");`
`279`	`280`	`#endif`
`280`	`281`	`_exit(1);`
`281`	`282`	`break;`
`282`	`283`	`case IDRETRY:`
`283`	`284`	`#ifdef DEBUG_LOGGING`
`284`	`285`	`if (logResult)`
`285`		`- DebugLog("[Retry]\n");`
	`286`	`+ DebugLog("[Retry]");`
`286`	`287`	`#endif`
`287`	`288`	`::DebugBreak();`
`288`	`289`	`break;`
`289`	`290`	`case IDIGNORE:`
`290`	`291`	`#ifdef DEBUG_LOGGING`
`291`	`292`	`// do nothing, just keep going`
`292`	`293`	`if (logResult)`
`293`		`- DebugLog("[Ignore]\n");`
	`294`	`+ DebugLog("[Ignore]");`
`294`	`295`	`#endif`
`295`	`296`	`break;`
`296`	`297`	`}`
`@@ -309,7 +310,7 @@ static void doStackDump()`
`309`	`310`	`const int STACKTRACE_SKIP = 2;`
`310`	`311`	`void* stacktrace[STACKTRACE_SIZE];`
`311`	`312`
`312`		`- doLogOutput("\nStack Dump:\n");`
	`313`	`+ doLogOutput("\nStack Dump:");`
`313`	`314`	`::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);`
`314`	`315`	`::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, doLogOutput);`
`315`	`316`	`}`
`@@ -397,7 +398,7 @@ void DebugInit(int flags)`
`397`	`398`	`theLogFile = fopen(theLogFileName, "w");`
`398`	`399`	`if (theLogFile != NULL)`
`399`	`400`	`{`
`400`		`- DebugLog("Log %s opened: %s\n", theLogFileName, getCurrentTimeString());`
	`401`	`+ DebugLog("Log %s opened: %s", theLogFileName, getCurrentTimeString());`
`401`	`402`	`}`
`402`	`403`	`#endif`
`403`	`404`	`}`
`@@ -495,7 +496,7 @@ void DebugCrash(const char *format, ...)`
`495`	`496`	`#ifdef DEBUG_LOGGING`
`496`	`497`	`if (ignoringAsserts())`
`497`	`498`	`{`
`498`		`- doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!\n");`
	`499`	`+ doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!");`
`499`	`500`	`}`
`500`	`501`	`whackFunnyCharacters(theCrashBuffer);`
`501`	`502`	`doLogOutput(theCrashBuffer);`
`@@ -507,7 +508,7 @@ void DebugCrash(const char *format, ...)`
`507`	`508`	`}`
`508`	`509`	`#endif`
`509`	`510`
`510`		`- strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");`
	`511`	`+ strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue");`
`511`	`512`
`512`	`513`	`int result = doCrashBox(theCrashBuffer, true);`
`513`	`514`
`@@ -547,7 +548,7 @@ void DebugShutdown()`
`547`	`548`	`#ifdef DEBUG_LOGGING`
`548`	`549`	`if (theLogFile)`
`549`	`550`	`{`
`550`		`- DebugLog("Log closed: %s\n", getCurrentTimeString());`
	`551`	`+ DebugLog("Log closed: %s", getCurrentTimeString());`
`551`	`552`	`fclose(theLogFile);`
`552`	`553`	`}`
`553`	`554`	`theLogFile = NULL;`
`@@ -624,9 +625,9 @@ void SimpleProfiler::stopAndLog(const char *msg, int howOftenToLog, int howOften`
`624`	`625`	`{`
`625`	`626`	`m_numSessions = 0;`
`626`	`627`	`m_totalAllSessions = 0;`
`627`		`- DEBUG_LOG(("%s: reset averages\n",msg));`
	`628`	`+ DEBUG_LOG(("%s: reset averages",msg));`
`628`	`629`	`}`
`629`		`- DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec\n",msg,getTime(),getTotalTime(),getAverageTime()));`
	`630`	`+ DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec",msg,getTime(),getTotalTime(),getAverageTime()));`
`630`	`631`	`}`
`631`	`632`
`632`	`633`	`// ----------------------------------------------------------------------------`
`@@ -683,7 +684,7 @@ double SimpleProfiler::getAverageTime()`
`683`	`684`	`{`
`684`	`685`	`if (theReleaseCrashLogFile)`
`685`	`686`	`{`
`686`		`- fprintf(theReleaseCrashLogFile, "%s", buffer); // note, no \n (should be there already)`
	`687`	`+ fprintf(theReleaseCrashLogFile, "%s\n", buffer);`
`687`	`688`	`fflush(theReleaseCrashLogFile);`
`688`	`689`	`}`
`689`	`690`	`}`