Changeset 65545 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2017 3:27:09 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113192

Message:

log.cpp: Keep offScratch in a local variable so we have consistent results regardless what's going on.

File:

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

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

@@ -3511 +3511 @@
         for (;;)
         {
-            size_t      cb = sizeof(pLogger->achScratch) - pLogger->offScratch - 1;
+            uint32_t    offScratch = pLogger->offScratch;
+            size_t      cb         = sizeof(pLogger->achScratch) - offScratch - 1;
             const char *pszNewLine;
             char       *psz;
@@ -3529 +3530 @@
 #if defined(DEBUG) && defined(IN_RING3)
                 /* sanity */
-                if (pLogger->offScratch >= sizeof(pLogger->achScratch))
+                if (offScratch >= sizeof(pLogger->achScratch))
                 {
-                    fprintf(stderr, "pLogger->offScratch >= sizeof(pLogger->achScratch) (%#x >= %#x)\n",
-                            pLogger->offScratch, (unsigned)sizeof(pLogger->achScratch));
+                    fprintf(stderr, "offScratch >= sizeof(pLogger->achScratch) (%#x >= %#x)\n",
+                            offScratch, (unsigned)sizeof(pLogger->achScratch));
                     AssertBreakpoint(); AssertBreakpoint();
                 }
@@ -3544 +3545 @@
                 {
                     rtlogFlush(pLogger);
-                    cb = sizeof(pLogger->achScratch) - pLogger->offScratch - 1;
+                    offScratch = pLogger->offScratch;
+                    cb = sizeof(pLogger->achScratch) - offScratch - 1;
                 }
 
@@ -3551 +3553 @@
                  * psz is pointing to the current position.
                  */
-                psz = &pLogger->achScratch[pLogger->offScratch];
+                psz = &pLogger->achScratch[offScratch];
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_TS)
                 {
@@ -3833 +3835 @@
                  * Done, figure what we've used and advance the buffer and free size.
                  */
-                cb = psz - &pLogger->achScratch[pLogger->offScratch];
+                cb = psz - &pLogger->achScratch[offScratch];
                 AssertMsg(cb <= 223, ("%#zx (%zd) - fFlags=%#x\n", cb, cb, pLogger->fFlags));
-                pLogger->offScratch += (uint32_t)cb;
-                cb = sizeof(pLogger->achScratch) - pLogger->offScratch - 1;
+                pLogger->offScratch = offScratch += (uint32_t)cb;
+                cb = sizeof(pLogger->achScratch) - offScratch - 1;
             }
             else if (cb <= 0)
             {
                 rtlogFlush(pLogger);
-                cb = sizeof(pLogger->achScratch) - pLogger->offScratch - 1;
+                offScratch = pLogger->offScratch;
+                cb = sizeof(pLogger->achScratch) - offScratch - 1;
             }
 
 #if defined(DEBUG) && defined(IN_RING3)
             /* sanity */
-            if (pLogger->offScratch >= sizeof(pLogger->achScratch))
+            if (offScratch >= sizeof(pLogger->achScratch))
             {
-                fprintf(stderr, "pLogger->offScratch >= sizeof(pLogger->achScratch) (%#x >= %#x)\n",
-                        pLogger->offScratch, (unsigned)sizeof(pLogger->achScratch));
+                fprintf(stderr, "offScratch >= sizeof(pLogger->achScratch) (%#x >= %#x)\n",
+                        offScratch, (unsigned)sizeof(pLogger->achScratch));
                 AssertBreakpoint(); AssertBreakpoint();
             }
@@ -3872 +3875 @@
 
             /* copy */
-            memcpy(&pLogger->achScratch[pLogger->offScratch], pachChars, cb);
+            memcpy(&pLogger->achScratch[offScratch], pachChars, cb);
 
             /* advance */
-            pLogger->offScratch += (uint32_t)cb;
+            pLogger->offScratch = offScratch += (uint32_t)cb;
             cbRet += cb;
             cbChars -= cb;
@@ -3881 +3884 @@
             if (    pszNewLine
                 &&  (pLogger->fFlags & RTLOGFLAGS_USECRLF)
-                &&  pLogger->offScratch + 2 < sizeof(pLogger->achScratch))
+                &&  offScratch + 2 < sizeof(pLogger->achScratch))
             {
-                memcpy(&pLogger->achScratch[pLogger->offScratch], "\r\n", 2);
-                pLogger->offScratch += 2;
+                memcpy(&pLogger->achScratch[offScratch], "\r\n", 2);
+                pLogger->offScratch = offScratch += 2;
                 cbRet++;
                 cbChars--;