Changeset 6325 in vbox

Timestamp:

Jan 10, 2008 1:27:36 PM (17 years ago)

Author:

vboxsync

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

27207

Message:

Fix a couple of wrong assertions and treat size_t variables correctly in
logging/assertion messages.

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -1682 +1682 @@
 
     LogFlowFunc(("pDisk=%#p uOffset=%llu pvBuf=%p cbRead=%llu\n",
-                 pDisk, uOffset, pvBuf, cbRead));
+                 pDisk, uOffset, pvBuf, (uint64_t)cbRead));
     do
     {
@@ -1694 +1694 @@
                        rc = VERR_INVALID_PARAMETER);
         AssertMsgBreak(cbRead,
-                       ("cbRead=%llu\n", cbRead),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(uOffset + cbRead > pDisk->cbSize,
+                       ("cbRead=%llu\n", (uint64_t)cbRead),
+                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreak(uOffset + cbRead <= pDisk->cbSize,
                        ("uOffset=%llu cbRead=%llu pDisk->cbSize=%llu\n",
-                        uOffset, cbRead, pDisk->cbSize),
+                        uOffset, (uint64_t)cbRead, pDisk->cbSize),
                        rc = VERR_INVALID_PARAMETER);
 
@@ -1721 +1721 @@
  * @param   cbWrite         Number of bytes to write.
  */
-VBOXDDU_DECL(int) VDWrite(PVBOXHDD pDisk, uint64_t uOffset, const void *pvBuf, size_t cbWrite)
+VBOXDDU_DECL(int) VDWrite(PVBOXHDD pDisk, uint64_t uOffset, const void *pvBuf,
+                          size_t cbWrite)
 {
     int rc = VINF_SUCCESS;
 
     LogFlowFunc(("pDisk=%#p uOffset=%llu pvBuf=%p cbWrite=%llu\n",
-                 pDisk, uOffset, pvBuf, cbWrite));
+                 pDisk, uOffset, pvBuf, (uint64_t)cbWrite));
     do
     {
@@ -1738 +1739 @@
                        rc = VERR_INVALID_PARAMETER);
         AssertMsgBreak(cbWrite,
-                       ("cbWrite=%llu\n", cbWrite),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(uOffset + cbWrite > pDisk->cbSize,
+                       ("cbWrite=%llu\n", (uint64_t)cbWrite),
+                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreak(uOffset + cbWrite <= pDisk->cbSize,
                        ("uOffset=%llu cbWrite=%llu pDisk->cbSize=%llu\n",
-                        uOffset, cbWrite, pDisk->cbSize),
+                        uOffset, (uint64_t)cbWrite, pDisk->cbSize),
                        rc = VERR_INVALID_PARAMETER);