Changeset 4442 in vbox

Timestamp:

Aug 30, 2007 11:29:08 AM (17 years ago)

Author:

vboxsync

Message:

size_t

Location:

trunk

Files:

• include/VBox/VBoxHDD.h (modified) (2 diffs)
• src/VBox/Devices/Network/DevPCNet.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/VDICore.cpp (modified) (6 diffs)

trunk/include/VBox/VBoxHDD.h

@@ -522 +522 @@
  * @param   cbToRead        Number of bytes to read.
  */
-VBOXDDU_DECL(int) VDIDiskRead(PVDIDISK pDisk, uint64_t offStart, void *pvBuf, unsigned cbToRead);
+VBOXDDU_DECL(int) VDIDiskRead(PVDIDISK pDisk, uint64_t offStart, void *pvBuf, size_t cbToRead);
 
 /**
@@ -533 +533 @@
  * @param   cbToWrite       Number of bytes to write.
  */
-VBOXDDU_DECL(int) VDIDiskWrite(PVDIDISK pDisk, uint64_t offStart, const void *pvBuf, unsigned cbToWrite);
+VBOXDDU_DECL(int) VDIDiskWrite(PVDIDISK pDisk, uint64_t offStart, const void *pvBuf, size_t cbToWrite);
 
 

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -2780 +2780 @@
             if (pData->fAm79C973 && (pData->aBCR[BCR_MIIADDR] >> 5 & 0x1f) == 0)
             {
-                size_t miiaddr = pData->aBCR[BCR_MIIADDR] & 0x1f;
+                uint32_t miiaddr = pData->aBCR[BCR_MIIADDR] & 0x1f;
                 val = pcnetMIIReadU16(pData, miiaddr);
             }

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

@@ -60 +60 @@
 static void vdiCloseImage(PVDIIMAGEDESC pImage);
 static int  vdiReadInBlock(PVDIIMAGEDESC pImage, unsigned uBlock, unsigned offRead,
-                           unsigned cbToRead, void *pvBuf);
+                           size_t cbToRead, void *pvBuf);
 static int  vdiFillBlockByZeroes(PVDIDISK pDisk, PVDIIMAGEDESC pImage, unsigned uBlock);
 static int  vdiWriteInBlock(PVDIDISK pDisk, PVDIIMAGEDESC pImage, unsigned uBlock,
-                            unsigned offWrite, unsigned cbToWrite, const void *pvBuf);
+                            unsigned offWrite, size_t cbToWrite, const void *pvBuf);
 static int  vdiCopyBlock(PVDIDISK pDisk, PVDIIMAGEDESC pImage, unsigned uBlock);
 static int  vdiMergeImages(PVDIIMAGEDESC pImageFrom, PVDIIMAGEDESC pImageTo, bool fParentToChild,
@@ -912 +912 @@
  */
 static int vdiReadInBlock(PVDIIMAGEDESC pImage, unsigned uBlock, unsigned offRead,
-                          unsigned cbToRead, void *pvBuf)
+                          size_t cbToRead, void *pvBuf)
 {
     if (IS_VDI_IMAGE_BLOCK_ALLOCATED(pImage->paBlocks[uBlock]))
@@ -942 +942 @@
  * @param   cbToRead        Number of bytes to read.
  */
-VBOXDDU_DECL(int) VDIDiskRead(PVDIDISK pDisk, uint64_t offStart, void *pvBuf, unsigned cbToRead)
+VBOXDDU_DECL(int) VDIDiskRead(PVDIDISK pDisk, uint64_t offStart, void *pvBuf, size_t cbToRead)
 {
     /* sanity check */
@@ -970 +970 @@
     for (;;)
     {
-        unsigned to_read;
+        size_t to_read;
         if ((offRead + cbToRead) <= cbBlock)
             to_read = cbToRead;
@@ -1062 +1062 @@
  * note: uBlock must be valid, written data must not overlap block bounds.
  */
-static int vdiWriteInBlock(PVDIDISK pDisk, PVDIIMAGEDESC pImage, unsigned uBlock, unsigned offWrite, unsigned cbToWrite, const void *pvBuf)
+static int vdiWriteInBlock(PVDIDISK pDisk, PVDIIMAGEDESC pImage, unsigned uBlock, unsigned offWrite, size_t cbToWrite, const void *pvBuf)
 {
     int rc;
@@ -1202 +1202 @@
  * @param   cbToWrite       Number of bytes to write.
  */
-VBOXDDU_DECL(int) VDIDiskWrite(PVDIDISK pDisk, uint64_t offStart, const void *pvBuf, unsigned cbToWrite)
+VBOXDDU_DECL(int) VDIDiskWrite(PVDIDISK pDisk, uint64_t offStart, const void *pvBuf, size_t cbToWrite)
 {
     /* sanity check */