hrev53416 adds 1 changeset to branch 'master'
old head: cca88a8133f0c9ddfbc8b6f0f83697f31edaab1d
new head: 06f4ddb09c8b395b1222a33330f7b8bc09674980
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=06f4ddb09c8b+%5Ecca88a8133f0
----------------------------------------------------------------------------
06f4ddb09c8b: nvme_disk: Add missing cast to off_t.
Should fix the 64-bit build.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53416
Commit: 06f4ddb09c8b395b1222a33330f7b8bc09674980
URL: https://git.haiku-os.org/haiku/commit/?id=06f4ddb09c8b
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Thu Aug 29 03:36:52 2019 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
index 1aa8abe48e..0110298ce4 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
@@ -424,7 +424,7 @@ nvme_disk_read(void* cookie, off_t pos, void* buffer,
size_t* length)
// The "rounded_len" will be the actual transferred
length, but
// of course it will contain the padding.
*length = std::min(*length, (size_t)std::max((off_t)0,
- rounded_len - (off_t)(pos - rounded_pos)));
+ (off_t)rounded_len - (off_t)(pos -
rounded_pos)));
if (*length == 0)
return status;
}
@@ -499,7 +499,7 @@ nvme_disk_write(void* cookie, off_t pos, const void*
buffer, size_t* length)
&rounded_len, true);
if (status != B_OK) {
*length = std::min(*length, (size_t)std::max((off_t)0,
- rounded_len - (off_t)(pos - rounded_pos)));
+ (off_t)rounded_len - (off_t)(pos -
rounded_pos)));
}
return status;
}
