Changeset 90850 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Aug 24, 2021 2:20:49 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/log: Tested the odd cases of the LF->CRLF translation. bugref:10086

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -91 +91 @@
 
 /** The default buffer size. */
-#define RTLOG_BUFFER_DEFAULT_SIZE       _64K
+#ifdef IN_RING0
+# define RTLOG_BUFFER_DEFAULT_SIZE      _64K
+#else
+# define RTLOG_BUFFER_DEFAULT_SIZE      _128K
+#endif
 /** Buffer alignment used RTLogCreateExV.   */
 #define RTLOG_BUFFER_ALIGN              64
@@ -4587 +4591 @@
                 cb = cbBuf - offBuf - 1;
             }
-            else if (cb <= 2) /* 2  - Make sure we can write a \r\n and not loop forever. */
+            else if (cb <= 2) /* 2 - Make sure we can write a \r\n and not loop forever. */
             {
                 rtlogFlush(pLoggerInt, true /*fNeedSpace*/);
@@ -4601 +4605 @@
             if (pszNewLine)
             {
+                cb = pszNewLine - pachChars;
                 if (!(pLoggerInt->fFlags & RTLOGFLAGS_USECRLF))
                 {
-                    cb = pszNewLine - pachChars + 1;
+                    cb += 1;
                     memcpy(&pchBuf[offBuf], pachChars, cb);
                     pLoggerInt->fPendingPrefix = true;
                 }
-                else if ((uintptr_t)(pszNewLine - pachChars) + 2U < cbBuf - offBuf)
+                else if (cb + 2U < cbBuf - offBuf)
                 {
-                    cb = pszNewLine - pachChars;
                     memcpy(&pchBuf[offBuf], pachChars, cb);
                     pchBuf[offBuf + cb++] = '\r';
@@ -4621 +4625 @@
                 {
                     /* Insufficient buffer space, leave the '\n' for the next iteration. */
-                    cb = pszNewLine - pachChars;
                     memcpy(&pchBuf[offBuf], pachChars, cb);
                 }