Changeset 63161 in vbox

Timestamp:

Aug 8, 2016 12:51:16 PM (8 years ago)

Author:

vboxsync

Message:

Main: Warnings

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• testcase/tstGuestCtrlParseBuffer.cpp (modified) (6 diffs)

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

@@ -823 +823 @@
 #endif
 
-    uint32_t GetOffset() { return m_offBuffer; }
+    size_t GetOffset() { return m_offBuffer; }
 
     size_t GetSize() { return m_cbUsed; }

trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp

@@ -114 +114 @@
 };
 
-int manualTest()
-{
-    int rc;
+int manualTest(void)
+{
+    int rc = VINF_SUCCESS;
     static struct
     {
@@ -131 +131 @@
     };
 
-    unsigned iTest = 0;
-    for (iTest; iTest < RT_ELEMENTS(aTest); iTest++)
+    for (unsigned iTest = 0; iTest < RT_ELEMENTS(aTest); iTest++)
     {
         RTTestIPrintf(RTTESTLVL_DEBUG, "Manual test #%d\n", iTest);
@@ -189 +188 @@
     RTAssertSetQuiet(true);
 
-    unsigned iTest = 0;
-    for (iTest; iTest < RT_ELEMENTS(aTestBlock); iTest++)
+    unsigned iTest;
+    for (iTest = 0; iTest < RT_ELEMENTS(aTestBlock); iTest++)
     {
         RTTestIPrintf(RTTESTLVL_DEBUG, "=> Test #%u\n", iTest);
@@ -207 +206 @@
             else if (stream.GetOffset() != aTestBlock[iTest].uOffsetAfter)
             {
-                RTTestFailed(hTest, "\tOffset %u wrong, expected %u\n",
+                RTTestFailed(hTest, "\tOffset %zu wrong, expected %u\n",
                              stream.GetOffset(), aTestBlock[iTest].uOffsetAfter);
             }
             else if (iResult == VERR_MORE_DATA)
             {
-                RTTestIPrintf(RTTESTLVL_DEBUG, "\tMore data (Offset: %u)\n", stream.GetOffset());
+                RTTestIPrintf(RTTESTLVL_DEBUG, "\tMore data (Offset: %zu)\n", stream.GetOffset());
             }
 
@@ -227 +226 @@
             /* There is remaining data left in the buffer (which needs to be merged
              * with a following buffer) -- print it. */
-            uint32_t uOffset = stream.GetOffset();
+            size_t uOffset = stream.GetOffset();
             size_t uToWrite = aTestBlock[iTest].cbData - uOffset;
             if (uToWrite)
@@ -244 +243 @@
     RTTestIPrintf(RTTESTLVL_INFO, "Doing block tests ...\n");
 
-    iTest = 0;
-    for (iTest; iTest < RT_ELEMENTS(aTestStream); iTest++)
+    for (iTest = 0; iTest < RT_ELEMENTS(aTestStream); iTest++)
     {
         RTTestIPrintf(RTTESTLVL_DEBUG, "=> Block test #%u\n", iTest);