Changeset 107595 in vbox

Timestamp:

Jan 9, 2025 12:03:23 PM (2 months ago)

Author:

vboxsync

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

166670

Message:

Devices/Storage/ATAPIPassthrough.cpp: Some parfait warning fixes, bugref:3409

File:

• trunk/src/VBox/Devices/Storage/ATAPIPassthrough.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Storage/ATAPIPassthrough.cpp

@@ -365 +365 @@
 {
     int rc;
-    uint16_t cbBuffer = (uint16_t)RT_MIN(scsiBE2H_U16(&pbCDB[7]), cbBuf);
+    size_t const cbBufMaxGst = scsiBE2H_U16(&pbCDB[7]);
+    uint16_t cbBuffer = (uint16_t)RT_MIN(cbBufMaxGst, cbBuf);
     bool fMSF = (pbCDB[1] & 0x2) != 0;
     uint8_t uFmt = pbCDB[2] & 0xf;
@@ -706 +707 @@
                                           size_t *pcbSector, uint8_t *pu8ScsiSts)
 {
-    uint32_t uLba = 0;
     uint32_t cSectors = 0;
     size_t cbSector = 0;
@@ -740 +740 @@
             break;
         case SCSI_ERASE_10:
-            uLba = scsiBE2H_U32(pbCdb + 2);
             cbXfer = scsiBE2H_U16(pbCdb + 7);
             enmTxDir = PDMMEDIATXDIR_TO_DEVICE;
@@ -786 +785 @@
             break;
         case SCSI_READ_10:
-            uLba = scsiBE2H_U32(pbCdb + 2);
             cSectors = scsiBE2H_U16(pbCdb + 7);
             cbSector = 2048;
@@ -794 +792 @@
             break;
         case SCSI_READ_12:
-            uLba = scsiBE2H_U32(pbCdb + 2);
             cSectors = scsiBE2H_U32(pbCdb + 6);
             cbSector = 2048;
@@ -942 +939 @@
         case SCSI_WRITE_10:
         case SCSI_WRITE_AND_VERIFY_10:
-            uLba = scsiBE2H_U32(pbCdb + 2);
+        {
+            uint32_t const uLba = scsiBE2H_U32(pbCdb + 2);
             cSectors = scsiBE2H_U16(pbCdb + 7);
             if (pTrackList)
@@ -952 +950 @@
             fPassthrough = true;
             break;
+        }
         case SCSI_WRITE_12:
-            uLba = scsiBE2H_U32(pbCdb + 2);
+        {
+            uint32_t const uLba = scsiBE2H_U32(pbCdb + 2);
             cSectors = scsiBE2H_U32(pbCdb + 6);
             if (pTrackList)
@@ -963 +963 @@
             fPassthrough = true;
             break;
+        }
         case SCSI_WRITE_BUFFER:
             switch (pbCdb[1] & 0x1f)