X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Flogging.c;h=3ccfef2b03159d61cb72f25e27f437bfbe5eef01;hb=9c4eedf4893f851bd1ba60ce541c8d098a9ef7f7;hp=2905dd1e65ee4245ac41ca660785f7e0d99cdfb1;hpb=85e4f7e3d5bea5db49e4dee4d94f9b2348017de3;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/logging.c b/KernelLand/Kernel/logging.c
index 2905dd1e..3ccfef2b 100644
--- a/KernelLand/Kernel/logging.c
+++ b/KernelLand/Kernel/logging.c
@@ -29,7 +29,10 @@ const char	*csaLevelColours[] = {
 		"\x1B[35m", "\x1B[34m", "\x1B[36m", "\x1B[31m",
 		"\x1B[33m", "\x1B[32m", "\x1B[0m", "\x1B[0m"
 		};
-const char	*csaLevelCodes[] =  {"k","p","f","e","w","n","l","d"};
+const char	*csaLevelCodes[] =  {
+		"k","p","f","e",
+		"w","n","l","d"
+		};
 
 // === TYPES ===
 typedef struct sLogEntry
@@ -155,18 +158,18 @@ void Log_Int_PrintMessage(tLogEntry *Entry)
 	if( CPU_HAS_LOCK(&glLogOutput) )
 		return ;	// TODO: Error?
 	SHORTLOCK( &glLogOutput );
-	LogF("%s%014lli",
+	bool completed = LogF(
+		"%s%014lli%s [%-8s] %i - %.*s\x1B[0m\r\n",
 		csaLevelColours[Entry->Level],
-		Entry->Time
-		);
-	LogF("%s [%-8s] %i - %.*s",
+		Entry->Time,
 		csaLevelCodes[Entry->Level],
 		Entry->Ident,
 		Threads_GetTID(),
 		Entry->Length,
 		Entry->Data
 		);
-	LogF("\x1B[0m\r\n");	// Separate in case Entry->Data is too long
+	if( !completed )
+		LogF("\x1B[0m\r\n");	// Separate in case Entry->Data is too long
 	SHORTREL( &glLogOutput );
 }