Changeset 38212 in vbox

Timestamp:

Jul 28, 2011 9:35:46 AM (14 years ago)

Author:

vboxsync

Message:

GuestCtrlIO/GuestProcessStream: Renamed member variables.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -67 +67 @@
     size_t GetNumPairs();
 
-    uint32_t GetOffset();
+    uint32_t GetOffsetBuffer();
+
+    uint32_t GetOffsetParser();
 
     const char* GetString(const char *pszKey);
@@ -86 +88 @@
     uint32_t m_cbSize;
     /** Current offset within the internal stream buffer. */
-    uint32_t m_cbOffset;
+    uint32_t m_cbOffsetBuffer;
     /** Current parser offset. */
-    uint32_t m_cbParserOffset;
+    uint32_t m_cbOffsetParser;
     /** Internal stream buffer. */
     BYTE *m_pbBuffer;

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

@@ -32 +32 @@
     : m_cbAllocated(0),
       m_cbSize(0),
-      m_cbOffset(0),
-      m_cbParserOffset(0),
+      m_cbOffsetBuffer(0),
+      m_cbOffsetParser(0),
       m_pbBuffer(NULL)
 {
@@ -53 +53 @@
 
     /* Rewind the buffer if it's empty. */
-    size_t     cbInBuf   = m_cbSize - m_cbOffset;
+    size_t     cbInBuf   = m_cbSize - m_cbOffsetBuffer;
     bool const fAddToSet = cbInBuf == 0;
     if (fAddToSet)
-        m_cbSize = m_cbOffset = 0;
+        m_cbSize = m_cbOffsetBuffer = 0;
 
     /* Try and see if we can simply append the data. */
@@ -67 +67 @@
     {
         /* Move any buffered data to the front. */
-        cbInBuf = m_cbSize - m_cbOffset;
+        cbInBuf = m_cbSize - m_cbOffsetBuffer;
         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 = m_cbOffsetBuffer = 0;
+        else if (m_cbOffsetBuffer) /* Do we have something to move? */
+        {
+            memmove(m_pbBuffer, &m_pbBuffer[m_cbOffsetBuffer], cbInBuf);
             m_cbSize = cbInBuf;
-            m_cbOffset = 0;
+            m_cbOffsetBuffer = 0;
         }
 
@@ -167 +167 @@
 }
 
-uint32_t GuestProcessStream::GetOffset()
-{
-    return m_cbOffset;
+uint32_t GuestProcessStream::GetOffsetBuffer()
+{
+    return m_cbOffsetBuffer;
+}
+
+uint32_t GuestProcessStream::GetOffsetParser()
+{
+    return m_cbOffsetParser;
 }
 
@@ -226 +231 @@
     AssertPtrReturn(m_pbBuffer, VINF_SUCCESS);
     AssertReturn(m_cbSize, VINF_SUCCESS);
-    AssertReturn(m_cbParserOffset < m_cbSize, VERR_INVALID_PARAMETER);
+    AssertReturn(m_cbOffsetParser <= m_cbSize, VERR_INVALID_PARAMETER);
 
     int rc = VINF_SUCCESS;
 
-    size_t uCur = m_cbParserOffset;
+    size_t uCur = m_cbOffsetParser;
     for (;uCur < m_cbSize;)
     {
@@ -258 +263 @@
                 || pszSep == pszEnd)
             {
-                m_cbParserOffset =  uCur - uPairLen - 1;
+                m_cbOffsetParser =  uCur - uPairLen - 1;
                 rc = VERR_MORE_DATA;
             }
@@ -299 +304 @@
                 RTMemFree(pszKey);
 
-                m_cbParserOffset += uCur - m_cbParserOffset;
+                m_cbOffsetParser += uCur - m_cbOffsetParser;
             }
         }
@@ -308 +313 @@
                 if (*pszEnd == '\0')
                 {
-                    m_cbParserOffset = uCur;
+                    m_cbOffsetParser = uCur;
                     rc = VERR_MORE_DATA;
                     break;
@@ -320 +325 @@
     }
 
-    RT_CLAMP(m_cbParserOffset, 0, m_cbSize);
+    RT_CLAMP(m_cbOffsetParser, 0, m_cbSize);
 
     return rc;