Changeset 47791 in vbox for trunk/src/VBox

Timestamp:

Aug 16, 2013 9:40:10 AM (12 years ago)

Author:

vboxsync

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

88052

Message:

Fixed a few size_t related warnings.

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAPIPassthrough.cpp (modified) (5 diffs)
• ATAPIPassthrough.h (modified) (1 diff)
• DevATA.cpp (modified) (9 diffs)

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

@@ -272 +272 @@
 {
     int rc = VINF_SUCCESS;
-    size_t cbCueSheet = atapiBE2H_U24(pbCDB + 6);
+    unsigned cbCueSheet = atapiBE2H_U24(pbCDB + 6);
     unsigned cTracks = cbCueSheet / 8;
 
@@ -311 +311 @@
  */
 static int atapiTrackListUpdateFromFormattedToc(PTRACKLIST pTrackList, uint8_t iTrack,
-                                                bool fMSF, const uint8_t *pbBuf, size_t cbBuffer)
+                                                bool fMSF, const uint8_t *pbBuf, uint32_t cbBuffer)
 {
     int rc = VINF_SUCCESS;
-    size_t cbToc = atapiBE2H_U16(pbBuf);
+    unsigned cbToc = atapiBE2H_U16(pbBuf);
     uint8_t iTrackFirst = pbBuf[2];
     unsigned cTracks;
@@ -359 +359 @@
             pTrack->fFlags &= ~TRACK_FLAGS_UNDETECTED;
             pbBuf += 8;
+            pTrack++;
         }
     }
@@ -368 +369 @@
 {
     int rc = VINF_SUCCESS;
-    size_t cbBuffer = atapiBE2H_U16(&pbCDB[7]);
+    uint16_t cbBuffer = atapiBE2H_U16(&pbCDB[7]);
     bool fMSF = (pbCDB[1] & 0x2) != 0;
     uint8_t uFmt = pbCDB[2] & 0xf;
@@ -551 +552 @@
 }
 
-DECLHIDDEN(size_t) ATAPIPassthroughTrackListGetSectorSizeFromLba(PTRACKLIST pTrackList, uint32_t iAtapiLba)
+DECLHIDDEN(uint32_t) ATAPIPassthroughTrackListGetSectorSizeFromLba(PTRACKLIST pTrackList, uint32_t iAtapiLba)
 {
     PTRACK pTrack = NULL;
-    size_t cbAtapiSector = 2048;
+    uint32_t cbAtapiSector = 2048;
 
     if (pTrackList->cTracksCurrent)

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

@@ -68 +68 @@
  * @param   iAtapiLba     The start LBA to get the sector size for.
  */
-DECLHIDDEN(size_t) ATAPIPassthroughTrackListGetSectorSizeFromLba(PTRACKLIST pTrackList, uint32_t iAtapiLba);
+DECLHIDDEN(uint32_t) ATAPIPassthroughTrackListGetSectorSizeFromLba(PTRACKLIST pTrackList, uint32_t iAtapiLba);
 
 RT_C_DECLS_END

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

@@ -2454 +2454 @@
 }
 
-static size_t atapiGetConfigurationFillFeatureListProfiles(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeatureListProfiles(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 3*4)
@@ -2472 +2472 @@
 }
 
-static size_t atapiGetConfigurationFillFeatureCore(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeatureCore(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 12)
@@ -2487 +2487 @@
 }
 
-static size_t atapiGetConfigurationFillFeatureMorphing(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeatureMorphing(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
@@ -2501 +2501 @@
 }
 
-static size_t atapiGetConfigurationFillFeatureRemovableMedium(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeatureRemovableMedium(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
@@ -2516 +2516 @@
 }
 
-static size_t atapiGetConfigurationFillFeatureRandomReadable(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeatureRandomReadable(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 12)
@@ -2532 +2532 @@
 }
 
-static size_t atapiGetConfigurationFillFeatureCDRead(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeatureCDRead(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
@@ -2546 +2546 @@
 }
 
-static size_t atapiGetConfigurationFillFeaturePowerManagement(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeaturePowerManagement(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 4)
@@ -2558 +2558 @@
 }
 
-static size_t atapiGetConfigurationFillFeatureTimeout(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiGetConfigurationFillFeatureTimeout(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
@@ -2574 +2574 @@
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
-    size_t cbBuf = s->cbIOBuffer;
-    size_t cbCopied = 0;
+    uint32_t cbBuf = s->cbIOBuffer;
+    uint32_t cbCopied = 0;
     uint16_t u16Sfn = ataBE2H_U16(&s->aATAPICmd[2]);