Changeset 103522 in vbox for trunk/src/VBox/Storage

Timestamp:

Feb 22, 2024 11:15:20 AM (12 months ago)

Author:

vboxsync

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

161865

Message:

Storage/testcase: Some unused variable fixes, bugref:3409

Location:

trunk/src/VBox/Storage/testcase

Files:

• VDScript.cpp (modified) (6 diffs)
• tstVDIo.cpp (modified) (5 diffs)
• tstVDSnap.cpp (modified) (2 diffs)
• vbox-img.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/testcase/VDScript.cpp

@@ -650 +650 @@
 
                 vdScriptTokenizerSkipCh(pTokenizer);
-                fOpFound = true;
                 break;
             }
@@ -1577 +1576 @@
                 break;
 
+            if (RT_FAILURE(rc))
+                break;
+
             pExprNew->BinaryOp.pLeftExpr = pExpr;
             pExpr = pExprNew;
@@ -1637 +1639 @@
             }
             else
+                break;
+
+            if (RT_FAILURE(rc))
                 break;
 
@@ -1719 +1724 @@
                 break;
 
+            if (RT_FAILURE(rc))
+                break;
+
             pExprNew->BinaryOp.pLeftExpr = pExpr;
             pExpr = pExprNew;
@@ -1779 +1787 @@
             }
             else
+                break;
+
+            if (RT_FAILURE(rc))
                 break;
 
@@ -2195 +2206 @@
             }
             else
+                break;
+
+            if (RT_SUCCESS(rc))
                 break;
 

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -1556 +1556 @@
                                 if (RT_SUCCESS(rc))
                                 {
+#ifdef RT_STRICT
                                     pEvtDesc = RTTraceLogRdrEvtGetDesc(hEvt);
                                     AssertMsg(!RTStrCmp(pEvtDesc->pszId, "Complete"),
                                               ("Expected a completion event but got: %s\n", pEvtDesc->pszId));
+#endif
                                 }
                             }
@@ -1617 +1619 @@
 
         if (RT_SUCCESS(rc))
-            rc = VDIoRndCreate(&pGlob->pIoRnd, cbPattern, uSeed);
+            rc = VDIoRndCreate(&pGlob->pIoRnd, cbPattern, uSeedToUse);
     }
 
@@ -1771 +1773 @@
         RTPrintf("Dumping memory file %s to %s, this might take some time\n", pcszFile, pcszPathToDump);
         rc = VDIoBackendDumpToFile(pIt->pIoStorage, pcszPathToDump);
-        rc = VERR_NOT_IMPLEMENTED;
     }
     else
@@ -2483 +2484 @@
            && cSectorsLeft)
     {
-        uint32_t cThisSectors = VDIoRndGetU32Ex(pIoTest->pIoRnd, 1, (uint32_t)cSectorsLeft / 2);
+        size_t cThisSectors = VDIoRndGetU32Ex(pIoTest->pIoRnd, 1, (uint32_t)cSectorsLeft / 2);
         size_t cbThisBuf = cThisSectors * 512;
 
@@ -2847 +2848 @@
                 }
                 else
+                {
                     rc = VDScriptCtxCallFn(hScriptCtx, "main", NULL, 0);
+                    if (RT_FAILURE(rc))
+                        RTPrintf("Executing the script failed rc=%Rrc\n", rc);
+                }
+
                 VDScriptCtxDestroy(hScriptCtx);
             }

trunk/src/VBox/Storage/testcase/tstVDSnap.cpp

@@ -260 +260 @@
     /* Create the virtual disk test data */
     pbTestPattern = (uint8_t *)RTMemAlloc(pTest->cbTestPattern);
+    if (!pbTestPattern)
+    {
+        RTPrintf("Failed to allocate memory for test pattern\n");
+        g_cErrors++;
+        return VERR_NO_MEMORY;
+    }
 
     RTRandAdvBytes(g_hRand, pbTestPattern, pTest->cbTestPattern);
@@ -409 +415 @@
 
     VDDestroy(pVD);
-    if (paDiskSeg)
-        RTMemFree(paDiskSeg);
-    if (pbTestPattern)
-        RTMemFree(pbTestPattern);
+    RTMemFree(paDiskSeg);
+    RTMemFree(pbTestPattern);
 
     RTFileDelete(pTest->pcszBaseImage);

trunk/src/VBox/Storage/testcase/vbox-img.cpp

@@ -826 +826 @@
     PFILEIOSTATE pFS = (PFILEIOSTATE)pStorage;
     AssertReturn(uOffset >= pFS->off, VERR_INVALID_PARAMETER);
-    int rc;
 
     /* Write the data to the buffer, flushing as required. */
@@ -835 +834 @@
         while (uOffset > pFS->offBuffer + sizeof(pFS->abBuffer) - 1)
         {
-            rc = RTFileWrite(pFS->file, &pFS->abBuffer[0],
-                             sizeof(pFS->abBuffer), NULL);
+            int rc = RTFileWrite(pFS->file, &pFS->abBuffer[0],
+                                 sizeof(pFS->abBuffer), NULL);
+            if (RT_FAILURE(rc))
+                return rc;
+
             RT_ZERO(pFS->abBuffer);
             pFS->offBuffer += sizeof(pFS->abBuffer);
@@ -966 +968 @@
     if (RT_SUCCESS(rc))
         pFS->cb = cbSize;
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -989 +991 @@
     PFILEIOSTATE pFS = (PFILEIOSTATE)pStorage;
     AssertReturn(uOffset >= pFS->off, VERR_INVALID_PARAMETER);
-    int rc;
 
     /* Write the data to the buffer, flushing as required. */
@@ -999 +1000 @@
         {
             if (!ASMMemIsZero(pFS->abBuffer, sizeof(pFS->abBuffer)))
-                rc = RTFileWriteAt(pFS->file, pFS->offBuffer,
-                                   &pFS->abBuffer[0],
-                                   sizeof(pFS->abBuffer), NULL);
+            {
+                int rc = RTFileWriteAt(pFS->file, pFS->offBuffer,
+                                       &pFS->abBuffer[0],
+                                       sizeof(pFS->abBuffer), NULL);
+                if (RT_FAILURE(rc))
+                    return rc;
+            }
             RT_ZERO(pFS->abBuffer);
             pFS->offBuffer += sizeof(pFS->abBuffer);