lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change logging to use native line-endings - i.e. CRLF on windows

Browse Source 
* This means even if notepad is associated with .log files, it will look
  correct, since notepad can't hand LF line-endings :(.
This commit is contained in:
baldurk
2017-09-19 16:23:48 +01:00
parent 61606d8aea
commit 6ec2aa55a0
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/common/common.cpp
+39 -5
View File
@@ -372,7 +372,7 @@ void rdclog_int(LogType type, const char *project, const char *file, unsigned in
char *output = rdclog_outputBuffer;
size_t available = rdclog_outBufSize;
const char *base = output;
char *base = output;
int numWritten = StringFormat::snprintf(output, available, "% 4s %06u: %s%s%s - ", project,
Process::GetCurrentPID(), timestamp, location,
@@ -432,10 +432,44 @@ void rdclog_int(LogType type, const char *project, const char *file, unsigned in
va_end(args2);
}
*output = '\n';
*(output + 1) = 0;
*output = 0;
rdclogprint_int(type, base, noPrefixOutput);
const char newline[] =
#if ENABLED(RDOC_WIN32)
"\r\n";
#else
"\n";
#endif
delete[] oversizedBuffer;
// likely path - string contains no newlines
char *nl = strchr(base, '\n');
if(nl == NULL)
{
rdclogprint_int(type, base, noPrefixOutput);
// print a newline automatically
rdclogprint_int(type, newline, newline);
}
else
{
// otherwise, print the string in sections to ensure newlines are in native format
while(nl)
{
*nl = 0;
rdclogprint_int(type, base, noPrefixOutput);
rdclogprint_int(type, newline, newline);
base = nl + 1;
noPrefixOutput = nl + 1;
nl = strchr(base, '\n');
}
// there will be the remainder up to the final non-trailing newline, print it
rdclogprint_int(type, base, noPrefixOutput);
rdclogprint_int(type, newline, newline);
}
SAFE_DELETE_ARRAY(oversizedBuffer);
}