Changeset 63258 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Aug 10, 2016 12:23:00 PM (8 years ago)

Author:

vboxsync

Message:

Main: warnings

Location:

trunk/src/VBox/Main/testcase

Files:

• tstGuestCtrlParseBuffer.cpp (modified) (9 diffs)
• tstVBoxAPI.cpp (modified) (1 diff)
• tstVBoxAPIPerf.cpp (modified) (1 diff)
• tstVBoxMultipleVM.cpp (modified) (2 diffs)

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

@@ -51 +51 @@
     uint32_t    uMapElements;
     int         iResult;
-} aTestBlock[] =
+} g_aTestBlock[] =
 {
     /*
@@ -103 +103 @@
     /** Overall result when done parsing. */
     int         iResult;
-} aTestStream[] =
+} g_aTestStream[] =
 {
     /* No blocks. */
@@ -125 +125 @@
         uint32_t    uMapElements;
         int         iResult;
-    } aTest[] =
+    } s_aTest[] =
     {
         { "test5=test5\0t51=t51",           sizeof("test5=test5\0t51=t51"),                            0,  sizeof("test5=test5\0") - 1,                   1, VERR_MORE_DATA },
@@ -131 +131 @@
     };
 
-    for (unsigned iTest = 0; iTest < RT_ELEMENTS(aTest); iTest++)
+    for (unsigned iTest = 0; iTest < RT_ELEMENTS(s_aTest); iTest++)
     {
         RTTestIPrintf(RTTESTLVL_DEBUG, "Manual test #%d\n", iTest);
 
         GuestProcessStream stream;
-        rc = stream.AddData((BYTE*)aTest[iTest].pbData, aTest[iTest].cbData);
+        rc = stream.AddData((BYTE*)s_aTest[iTest].pbData, s_aTest[iTest].cbData);
 
         for (;;)
@@ -189 +189 @@
 
     unsigned iTest;
-    for (iTest = 0; iTest < RT_ELEMENTS(aTestBlock); iTest++)
+    for (iTest = 0; iTest < RT_ELEMENTS(g_aTestBlock); iTest++)
     {
         RTTestIPrintf(RTTESTLVL_DEBUG, "=> Test #%u\n", iTest);
 
         GuestProcessStream stream;
-        int iResult = stream.AddData((BYTE*)aTestBlock[iTest].pbData, aTestBlock[iTest].cbData);
+        int iResult = stream.AddData((BYTE*)g_aTestBlock[iTest].pbData, g_aTestBlock[iTest].cbData);
         if (RT_SUCCESS(iResult))
         {
             GuestProcessStreamBlock curBlock;
             iResult = stream.ParseBlock(curBlock);
-            if (iResult != aTestBlock[iTest].iResult)
+            if (iResult != g_aTestBlock[iTest].iResult)
             {
                 RTTestFailed(hTest, "\tReturned %Rrc, expected %Rrc\n",
-                             iResult, aTestBlock[iTest].iResult);
-            }
-            else if (stream.GetOffset() != aTestBlock[iTest].uOffsetAfter)
+                             iResult, g_aTestBlock[iTest].iResult);
+            }
+            else if (stream.GetOffset() != g_aTestBlock[iTest].uOffsetAfter)
             {
                 RTTestFailed(hTest, "\tOffset %zu wrong, expected %u\n",
-                             stream.GetOffset(), aTestBlock[iTest].uOffsetAfter);
+                             stream.GetOffset(), g_aTestBlock[iTest].uOffsetAfter);
             }
             else if (iResult == VERR_MORE_DATA)
@@ -217 +217 @@
                    || iResult == VERR_MORE_DATA))
             {
-                if (curBlock.GetCount() != aTestBlock[iTest].uMapElements)
+                if (curBlock.GetCount() != g_aTestBlock[iTest].uMapElements)
                 {
                     RTTestFailed(hTest, "\tMap has %u elements, expected %u\n",
-                                 curBlock.GetCount(), aTestBlock[iTest].uMapElements);
+                                 curBlock.GetCount(), g_aTestBlock[iTest].uMapElements);
                 }
             }
@@ -226 +226 @@
             /* There is remaining data left in the buffer (which needs to be merged
              * with a following buffer) -- print it. */
-            size_t uOffset = stream.GetOffset();
-            size_t uToWrite = aTestBlock[iTest].cbData - uOffset;
-            if (uToWrite)
-            {
-                const char *pszRemaining = aTestBlock[iTest].pbData;
-                RTTestIPrintf(RTTESTLVL_DEBUG, "\tRemaining (%u):\n", uToWrite);
+            size_t off = stream.GetOffset();
+            size_t cbToWrite = g_aTestBlock[iTest].cbData - off;
+            if (cbToWrite)
+            {
+                RTTestIPrintf(RTTESTLVL_DEBUG, "\tRemaining (%u):\n", cbToWrite);
 
                 /* How to properly get the current RTTESTLVL (aka IPRT_TEST_MAX_LEVEL) here?
                  * Hack alert: Using RTEnvGet for now. */
                 if (!RTStrICmp(RTEnvGet("IPRT_TEST_MAX_LEVEL"), "debug"))
-                    RTStrmWriteEx(g_pStdOut, &aTestBlock[iTest].pbData[uOffset], uToWrite - 1, NULL);
+                    RTStrmWriteEx(g_pStdOut, &g_aTestBlock[iTest].pbData[off], cbToWrite - 1, NULL);
             }
         }
@@ -243 +242 @@
     RTTestIPrintf(RTTESTLVL_INFO, "Doing block tests ...\n");
 
-    for (iTest = 0; iTest < RT_ELEMENTS(aTestStream); iTest++)
+    for (iTest = 0; iTest < RT_ELEMENTS(g_aTestStream); iTest++)
     {
         RTTestIPrintf(RTTESTLVL_DEBUG, "=> Block test #%u\n", iTest);
 
         GuestProcessStream stream;
-        int iResult = stream.AddData((BYTE*)aTestStream[iTest].pbData, aTestStream[iTest].cbData);
+        int iResult = stream.AddData((BYTE*)g_aTestStream[iTest].pbData, g_aTestStream[iTest].cbData);
         if (RT_SUCCESS(iResult))
         {
@@ -268 +267 @@
             } while (RT_SUCCESS(iResult));
 
-            if (iResult != aTestStream[iTest].iResult)
+            if (iResult != g_aTestStream[iTest].iResult)
             {
                 RTTestFailed(hTest, "\tReturned %Rrc, expected %Rrc\n",
-                             iResult, aTestStream[iTest].iResult);
-            }
-            else if (uNumBlocks != aTestStream[iTest].uNumBlocks)
+                             iResult, g_aTestStream[iTest].iResult);
+            }
+            else if (uNumBlocks != g_aTestStream[iTest].uNumBlocks)
             {
                 RTTestFailed(hTest, "\tReturned %u blocks, expected %u\n",
-                             uNumBlocks, aTestStream[iTest].uNumBlocks);
+                             uNumBlocks, g_aTestStream[iTest].uNumBlocks);
             }
         }

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

@@ -354 +354 @@
 
 
-int main(int argc, char **argv)
+int main()
 {
     /*

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

@@ -196 +196 @@
 
 
-int main(int argc, char **argv)
+int main()
 {
     /*

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

@@ -337 +337 @@
 static int tstClean(IVirtualBox *pVBox, IVirtualBoxClient *pClient)
 {
+    NOREF(pClient);
     HRESULT rc = S_OK;
 
@@ -380 +381 @@
 
 
-static DECLCALLBACK(int) tstThreadRun(RTTHREAD thread, void *pvUser)
-{
+static DECLCALLBACK(int) tstThreadRun(RTTHREAD hThreadSelf, void *pvUser)
+{
+    RT_NOREF(hThreadSelf);
     TestThreadArgs* args = (TestThreadArgs*)pvUser;
     Assert(args != NULL);