Changeset 63154 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 8, 2016 12:01:32 PM (8 years ago)

Author:

vboxsync

Message:

Main: More warnings about uninitialized variables (false ones) and size_t vs uint32_t mixup. Some data member renaming too.

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (9 diffs)
• src-client/GuestFileImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -823 +823 @@
 #endif
 
-    uint32_t GetOffset() { return m_cbOffset; }
-
-    size_t GetSize() { return m_cbSize; }
+    uint32_t GetOffset() { return m_offBuffer; }
+
+    size_t GetSize() { return m_cbUsed; }
 
     int ParseBlock(GuestProcessStreamBlock &streamBlock);
@@ -832 +832 @@
 
     /** Currently allocated size of internal stream buffer. */
-    uint32_t m_cbAllocated;
-    /** Currently used size of allocated internal stream buffer. */
-    size_t m_cbSize;
-    /** Current offset within the internal stream buffer. */
-    uint32_t m_cbOffset;
+    size_t m_cbAllocated;
+    /** Currently used size at m_offBuffer. */
+    size_t m_cbUsed;
+    /** Current byte offset within the internal stream buffer. */
+    size_t m_offBuffer;
     /** Internal stream buffer. */
     BYTE *m_pbBuffer;

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -357 +357 @@
 GuestProcessStream::GuestProcessStream(void)
     : m_cbAllocated(0),
-      m_cbSize(0),
-      m_cbOffset(0),
+      m_cbUsed(0),
+      m_offBuffer(0),
       m_pbBuffer(NULL)
 {
@@ -385 +385 @@
 
     /* Rewind the buffer if it's empty. */
-    size_t     cbInBuf   = m_cbSize - m_cbOffset;
+    size_t     cbInBuf   = m_cbUsed - m_offBuffer;
     bool const fAddToSet = cbInBuf == 0;
     if (fAddToSet)
-        m_cbSize = m_cbOffset = 0;
+        m_cbUsed = m_offBuffer = 0;
 
     /* Try and see if we can simply append the data. */
-    if (cbData + m_cbSize <= m_cbAllocated)
-    {
-        memcpy(&m_pbBuffer[m_cbSize], pbData, cbData);
-        m_cbSize += cbData;
+    if (cbData + m_cbUsed <= m_cbAllocated)
+    {
+        memcpy(&m_pbBuffer[m_cbUsed], pbData, cbData);
+        m_cbUsed += cbData;
     }
     else
     {
         /* Move any buffered data to the front. */
-        cbInBuf = m_cbSize - m_cbOffset;
+        cbInBuf = m_cbUsed - m_offBuffer;
         if (cbInBuf == 0)
-            m_cbSize = m_cbOffset = 0;
-        else if (m_cbOffset) /* Do we have something to move? */
-        {
-            memmove(m_pbBuffer, &m_pbBuffer[m_cbOffset], cbInBuf);
-            m_cbSize = cbInBuf;
-            m_cbOffset = 0;
+            m_cbUsed = m_offBuffer = 0;
+        else if (m_offBuffer) /* Do we have something to move? */
+        {
+            memmove(m_pbBuffer, &m_pbBuffer[m_offBuffer], cbInBuf);
+            m_cbUsed = cbInBuf;
+            m_offBuffer = 0;
         }
 
         /* Do we need to grow the buffer? */
-        if (cbData + m_cbSize > m_cbAllocated)
-        {
-            size_t cbAlloc = m_cbSize + cbData;
+        if (cbData + m_cbUsed > m_cbAllocated)
+        {
+/** @todo Put an upper limit on the allocation?   */
+            size_t cbAlloc = m_cbUsed + cbData;
             cbAlloc = RT_ALIGN_Z(cbAlloc, _64K);
             void *pvNew = RTMemRealloc(m_pbBuffer, cbAlloc);
@@ -427 +428 @@
         if (RT_SUCCESS(rc))
         {
-            if (cbData + m_cbSize <= m_cbAllocated)
+            if (cbData + m_cbUsed <= m_cbAllocated)
             {
-                memcpy(&m_pbBuffer[m_cbSize], pbData, cbData);
-                m_cbSize += cbData;
+                memcpy(&m_pbBuffer[m_cbUsed], pbData, cbData);
+                m_cbUsed += cbData;
             }
             else
@@ -452 +453 @@
 
     m_cbAllocated = 0;
-    m_cbSize = 0;
-    m_cbOffset = 0;
+    m_cbUsed = 0;
+    m_offBuffer = 0;
 }
 
@@ -460 +461 @@
 {
     LogFlowFunc(("Dumping contents of stream=0x%p (cbAlloc=%u, cbSize=%u, cbOff=%u) to %s\n",
-                 m_pbBuffer, m_cbAllocated, m_cbSize, m_cbOffset, pszFile));
+                 m_pbBuffer, m_cbAllocated, m_cbUsed, m_offBuffer, pszFile));
 
     RTFILE hFile;
@@ -466 +467 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTFileWrite(hFile, m_pbBuffer, m_cbSize, NULL /* pcbWritten */);
+        rc = RTFileWrite(hFile, m_pbBuffer, m_cbUsed, NULL /* pcbWritten */);
         RTFileClose(hFile);
     }
@@ -493 +494 @@
 {
     if (   !m_pbBuffer
-        || !m_cbSize)
+        || !m_cbUsed)
     {
         return VERR_NO_DATA;
     }
 
-    AssertReturn(m_cbOffset <= m_cbSize, VERR_INVALID_PARAMETER);
-    if (m_cbOffset == m_cbSize)
+    AssertReturn(m_offBuffer <= m_cbUsed, VERR_INVALID_PARAMETER);
+    if (m_offBuffer == m_cbUsed)
         return VERR_NO_DATA;
 
     int rc = VINF_SUCCESS;
 
-    char    *pszOff    = (char*)&m_pbBuffer[m_cbOffset];
+    char    *pszOff    = (char*)&m_pbBuffer[m_offBuffer];
     char    *pszStart  = pszOff;
     uint32_t uDistance;
@@ -511 +512 @@
         size_t pairLen = strlen(pszStart);
         uDistance = (pszStart - pszOff);
-        if (m_cbOffset + uDistance + pairLen + 1 >= m_cbSize)
+        if (m_offBuffer + uDistance + pairLen + 1 >= m_cbUsed)
         {
             rc = VERR_MORE_DATA;
@@ -547 +548 @@
     if (   !uDistance
         && *pszStart == '\0'
-        && m_cbOffset < m_cbSize)
+        && m_offBuffer < m_cbUsed)
     {
         uDistance++;
     }
-    m_cbOffset += uDistance;
+    m_offBuffer += uDistance;
 
     return rc;

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -738 +738 @@
     alock.release(); /* Drop write lock before sending. */
 
-    uint32_t cbRead;
     vrc = sendCommand(HOST_FILE_READ, i, paParms);
     if (RT_SUCCESS(vrc))
+    {
+        uint32_t cbRead = 0;
         vrc = i_waitForRead(pEvent, uTimeoutMS, pvData, cbData, &cbRead);
-
-    if (RT_SUCCESS(vrc))
-    {
-        LogFlowThisFunc(("cbRead=%RU32\n", cbRead));
-
-        if (pcbRead)
-            *pcbRead = cbRead;
+        if (RT_SUCCESS(vrc))
+        {
+            LogFlowThisFunc(("cbRead=%RU32\n", cbRead));
+            if (pcbRead)
+                *pcbRead = cbRead;
+        }
     }
 
@@ -794 +794 @@
     alock.release(); /* Drop write lock before sending. */
 
-    uint32_t cbRead;
     vrc = sendCommand(HOST_FILE_READ_AT, i, paParms);
     if (RT_SUCCESS(vrc))
+    {
+        uint32_t cbRead = 0;
         vrc = i_waitForRead(pEvent, uTimeoutMS, pvData, cbData, &cbRead);
-
-    if (RT_SUCCESS(vrc))
-    {
-        LogFlowThisFunc(("cbRead=%RU32\n", cbRead));
-
-        if (pcbRead)
-            *pcbRead = cbRead;
+        if (RT_SUCCESS(vrc))
+        {
+            LogFlowThisFunc(("cbRead=%RU32\n", cbRead));
+
+            if (pcbRead)
+                *pcbRead = cbRead;
+        }
     }
 
@@ -1099 +1100 @@
     alock.release(); /* Drop write lock before sending. */
 
-    uint32_t cbWritten;
     vrc = sendCommand(HOST_FILE_WRITE, i, paParms);
     if (RT_SUCCESS(vrc))
+    {
+        uint32_t cbWritten = 0;
         vrc = i_waitForWrite(pEvent, uTimeoutMS, &cbWritten);
-
-    if (RT_SUCCESS(vrc))
-    {
-        LogFlowThisFunc(("cbWritten=%RU32\n", cbWritten));
-
-        if (cbWritten)
-            *pcbWritten = cbWritten;
+        if (RT_SUCCESS(vrc))
+        {
+            LogFlowThisFunc(("cbWritten=%RU32\n", cbWritten));
+            if (cbWritten)
+                *pcbWritten = cbWritten;
+        }
     }
 
@@ -1159 +1160 @@
     alock.release(); /* Drop write lock before sending. */
 
-    uint32_t cbWritten;
     vrc = sendCommand(HOST_FILE_WRITE_AT, i, paParms);
     if (RT_SUCCESS(vrc))
+    {
+        uint32_t cbWritten = 0;
         vrc = i_waitForWrite(pEvent, uTimeoutMS, &cbWritten);
-
-    if (RT_SUCCESS(vrc))
-    {
-        LogFlowThisFunc(("cbWritten=%RU32\n", cbWritten));
-
-        if (cbWritten)
-            *pcbWritten = cbWritten;
+        if (RT_SUCCESS(vrc))
+        {
+            LogFlowThisFunc(("cbWritten=%RU32\n", cbWritten));
+            if (cbWritten)
+                *pcbWritten = cbWritten;
+        }
     }