X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Flogging.c;h=0ae993e5b37ac3d6b690d44e6273023ad5d08f79;hb=aa62597b70c3f3753ee21b174ca695b6b6c4cdef;hp=9617b834820d442193468975095d15edd0db0d5d;hpb=f5339852eb9737ab9681d24587bc66b66ca568e7;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/logging.c b/KernelLand/Kernel/logging.c index 9617b834..0ae993e5 100644 --- a/KernelLand/Kernel/logging.c +++ b/KernelLand/Kernel/logging.c @@ -91,11 +91,9 @@ void Log_AddEvent(const char *Ident, int Level, const char *Format, va_list Args va_list args_tmp; if( Level >= NUM_LOG_LEVELS ) return; - + va_copy(args_tmp, Args); - len = vsnprintf(NULL, 256, Format, args_tmp); - - //Log("len = %i", len); + len = vsnprintf(NULL, 0, Format, args_tmp); #if USE_RING_BUFFER || !CACHE_MESSAGES { @@ -161,12 +159,15 @@ void Log_Int_PrintMessage(tLogEntry *Entry) if( CPU_HAS_LOCK(&glLogOutput) ) return ; // TODO: Error? SHORTLOCK( &glLogOutput ); - LogF("%s%014lli%s [%-8s] %i - %s", + LogF("%s%014lli", csaLevelColours[Entry->Level], - Entry->Time, + Entry->Time + ); + LogF("%s [%-8s] %i - %.*s", csaLevelCodes[Entry->Level], Entry->Ident, Threads_GetTID(), + Entry->Length, Entry->Data ); LogF("\x1B[0m\r\n"); // Separate in case Entry->Data is too long